Trebuchet: Labels on dock items

Patchset 4: Discard item scale and use paddings to adjust the workspace
Patchset 5: mHideDockIconLabels = false on vertical hotseat
Patchset 6: Fixed FolderIcon typo
            Fixed inline style
            Remove Workspace injection on Launcher class
            Use isLargeScreen to show text in vertical hotseat

Change-Id: I00c57a28b4c7110b66ec6f856df8865006a76699
JIRA: CYAN-523
Issue: https://jira.cyanogenmod.org/browse/CYAN-523
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

6 files changed, 18 insertions, 0 deletions

diff --git a/res/values-sw340dp/dimens.xml b/res/values-sw340dp/dimens.xml
index 7fcbefd06..e7ab9f584 100644
--- a/res/values-sw340dp/dimens.xml
+++ b/res/values-sw340dp/dimens.xml
@@ -23,12 +23,14 @@
     <dimen name="hotseat_height_gap">0dp</dimen>
     <!-- height of the bottom row of controls -->
     <dimen name="button_bar_height">62dip</dimen>
+    <dimen name="button_bar_height_with_text">90dip</dimen>
     <!-- Because portal animations go beyond the bounds of an icon, we need
          to make the dock layout slightly larger than the button_bar_height -->
     <dimen name="button_bar_height_bottom_padding">0dp</dimen>
     <dimen name="button_bar_width_left_padding">8dp</dimen>
     <dimen name="button_bar_width_right_padding">8dp</dimen>
     <dimen name="button_bar_height_plus_padding">62dp</dimen>
+    <dimen name="button_bar_height_plus_padding_with_text">90dp</dimen>
 
 <!-- CellLayout padding land / port-->
     <dimen name="cell_layout_left_padding_port">8dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index bf19e5c88..55d9bf7fb 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -35,11 +35,13 @@
     <dimen name="hotseat_width_gap">-1dp</dimen>
     <dimen name="hotseat_height_gap">-1dp</dimen>
     <dimen name="button_bar_height">94dip</dimen>
+    <dimen name="button_bar_height_with_text">@dimen/button_bar_height</dimen>
     <dimen name="button_bar_height_bottom_padding">14dp</dimen>
     <dimen name="button_bar_height_top_padding">20dp</dimen>
     <dimen name="button_bar_width_left_padding">25dp</dimen>
     <dimen name="button_bar_width_right_padding">25dp</dimen>
     <dimen name="button_bar_height_plus_padding">104dp</dimen>
+    <dimen name="button_bar_height_plus_padding_with_text">@dimen/button_bar_height_plus_padding</dimen>
 
 <!-- Folders -->
     <!-- The size of the image which sits behind the preview of the folder contents -->
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 80d4b3bb4..6e1727dbb 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,11 +21,13 @@
 
 <!-- Hotseat -->
     <dimen name="button_bar_height">82dp</dimen>
+    <dimen name="button_bar_height_with_text">@dimen/button_bar_height</dimen>
     <dimen name="button_bar_height_top_padding">12dp</dimen>
     <dimen name="button_bar_height_bottom_padding">12dp</dimen>
     <dimen name="button_bar_width_left_padding">12dp</dimen>
     <dimen name="button_bar_width_right_padding">12dp</dimen>
     <dimen name="button_bar_height_plus_padding">82dp</dimen>
+    <dimen name="button_bar_height_plus_padding_with_text">@dimen/button_bar_height_plus_padding</dimen>
     <dimen name="hotseat_width_gap">58dp</dimen>
 
 <!-- QSB -->
@@ -89,6 +91,7 @@
     <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen>
     <dimen name="workspace_top_padding_land">@dimen/qsb_bar_height_inset</dimen>
     <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height_plus_padding</dimen>
+    <dimen name="workspace_bottom_padding_port_with_text">@dimen/button_bar_height_plus_padding</dimen>
     <dimen name="workspace_bottom_padding_land">@dimen/button_bar_height_plus_padding</dimen>
 
     <!-- Divider width set to match the qsb width -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index affa6591c..511e0d527 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -139,6 +139,8 @@
     <string name="preferences_interface_dock_default_page_summary">Choose the default page</string>
     <string name="preferences_interface_dock_icons_title">Icons</string>
     <string name="preferences_interface_dock_icons_summary">Number of icons/columns in the dock</string>
+    <string name="preferences_interface_dock_hide_icon_labels_title">Hide icon labels</string>
+    <string name="preferences_interface_dock_hide_icon_labels_summary">Hide dock icon labels</string>
     <string name="preferences_interface_dock_icon_scale_title">Icon scale</string>
     <string name="preferences_interface_dock_icon_scale_summary">Scale of icons in the dock</string>
     <string name="preferences_interface_dock_divider_title">Show dock divider</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a5ffc0ba6..21eaf2570 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -79,6 +79,7 @@
 
     <!-- height of the bottom row of controls -->
     <dimen name="button_bar_height">62dip</dimen>
+    <dimen name="button_bar_height_with_text">90dip</dimen>
     <!-- Because portal animations go beyond the bounds of an icon, we need
          to make the dock layout slightly larger than the button_bar_height -->
     <dimen name="button_bar_height_top_padding">0dp</dimen>
@@ -86,6 +87,7 @@
     <dimen name="button_bar_width_left_padding">0dp</dimen>
     <dimen name="button_bar_width_right_padding">0dp</dimen>
     <dimen name="button_bar_height_plus_padding">62dp</dimen>
+    <dimen name="button_bar_height_plus_padding_with_text">90dp</dimen>
 
     <!-- Drag padding to add to the bottom of drop targets -->
     <dimen name="drop_target_drag_padding">14dp</dimen>
@@ -148,6 +150,7 @@
     <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen>
     <dimen name="workspace_top_padding_land">0dp</dimen>
     <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height</dimen>
+    <dimen name="workspace_bottom_padding_port_with_text">100dp</dimen>
     <dimen name="workspace_bottom_padding_land">0dp</dimen>
 
     <dimen name="workspace_left_padding_port_qsb_hidden">0dp</dimen>
@@ -171,4 +174,5 @@
 
 <!-- Preferences -->
     <dimen name="header_icon_width">28dp</dimen>
+
 </resources>
diff --git a/res/xml/preferences_dock.xml b/res/xml/preferences_dock.xml
index c07a1cb39..f24c64f9f 100644
--- a/res/xml/preferences_dock.xml
+++ b/res/xml/preferences_dock.xml
@@ -44,6 +44,11 @@
         launcher:max="@integer/hotseat_cell_count"
         launcher:min="3" />
     <!-- android:dependency="ui_dock_enabled" /-->
+    <CheckBoxPreference android:key="ui_dock_hide_icon_labels"
+        android:title="@string/preferences_interface_dock_hide_icon_labels_title"
+        android:summary="@string/preferences_interface_dock_hide_icon_labels_summary"
+        android:defaultValue="true" />
+    <!-- android:dependency="ui_dock_enabled" /-->
     <com.cyanogenmod.trebuchet.preference.SeekBarDialogPreference android:key="ui_dock_icon_scale"
         android:title="@string/preferences_interface_dock_icon_scale_title"
         android:summary="@string/preferences_interface_dock_icon_scale_summary"