From decbaf63416b21d1aece708b8c0b6523b47f74ac Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Sun, 28 Apr 2013 05:11:42 +0200 Subject: 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 --- res/values-sw340dp/dimens.xml | 2 ++ res/values-sw600dp/dimens.xml | 2 ++ res/values-sw720dp/dimens.xml | 3 +++ res/values/cm_strings.xml | 2 ++ res/values/dimens.xml | 4 ++++ res/xml/preferences_dock.xml | 5 +++++ 6 files changed, 18 insertions(+) (limited to 'res') 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 @@ 0dp 62dip + 90dip 0dp 8dp 8dp 62dp + 90dp 8dp 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 @@ -1dp -1dp 94dip + @dimen/button_bar_height 14dp 20dp 25dp 25dp 104dp + @dimen/button_bar_height_plus_padding 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 @@ 82dp + @dimen/button_bar_height 12dp 12dp 12dp 12dp 82dp + @dimen/button_bar_height_plus_padding 58dp @@ -89,6 +91,7 @@ @dimen/qsb_bar_height_inset @dimen/qsb_bar_height_inset @dimen/button_bar_height_plus_padding + @dimen/button_bar_height_plus_padding @dimen/button_bar_height_plus_padding 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 @@ Choose the default page Icons Number of icons/columns in the dock + Hide icon labels + Hide dock icon labels Icon scale Scale of icons in the dock Show dock divider 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 @@ 62dip + 90dip 0dp @@ -86,6 +87,7 @@ 0dp 0dp 62dp + 90dp 14dp @@ -148,6 +150,7 @@ @dimen/qsb_bar_height_inset 0dp @dimen/button_bar_height + 100dp 0dp 0dp @@ -171,4 +174,5 @@ 28dp + 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" /> + +