summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAndrew Flynn <flynn@google.com>2012-03-06 11:39:49 -0800
committerAndrew Flynn <flynn@google.com>2012-03-06 13:31:44 -0800
commitbc239a15464f543a41b960b946aa77258454efaf (patch)
tree00885d354285fe7f7c73f9f8d439ea27d299d7c9 /res/values
parent9d852533dedb556bd3072b4af5d4ccf6828de63b (diff)
downloadandroid_packages_apps_Trebuchet-bc239a15464f543a41b960b946aa77258454efaf.tar.gz
android_packages_apps_Trebuchet-bc239a15464f543a41b960b946aa77258454efaf.tar.bz2
android_packages_apps_Trebuchet-bc239a15464f543a41b960b946aa77258454efaf.zip
Scale icons down for sw600dp-land mode.
Cached icons are statically all the same size, so we need to do it on the fly. Change-Id: Iae294ff4668f987db8fe5127bae724bf08363542
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml3
-rw-r--r--res/values/styles.xml4
2 files changed, 5 insertions, 2 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4ed16893e..aaed57176 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -47,8 +47,10 @@
<dimen name="hotseat_width_gap">-1dp</dimen>
<dimen name="hotseat_height_gap">-1dp</dimen>
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
+ <dimen name="workspace_icon_text_size">12sp</dimen>
<dimen name="app_icon_drawable_padding">6dp</dimen>
+ <dimen name="app_icon_drawable_padding_land">2dp</dimen>
<dimen name="app_icon_padding_top">8dp</dimen>
<!-- QSB -->
@@ -66,6 +68,7 @@
<dimen name="apps_customize_tab_bar_height">52dp</dimen>
<dimen name="apps_customize_tab_bar_margin_top">0dp</dimen>
<dimen name="app_icon_size">48dp</dimen>
+ <integer name="app_icon_scale_percent">-1</integer>
<integer name="app_icon_hotseat_scale_percent">-1</integer>
<!-- The width can be 72dp because we don't have L/R padding -->
<dimen name="apps_customize_cell_width">74dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f5224d2eb..6506f955b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -62,7 +62,7 @@
<item name="android:gravity">center_horizontal</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">marquee</item>
- <item name="android:textSize">12sp</item>
+ <item name="android:textSize">@dimen/workspace_icon_text_size</item>
<item name="android:textColor">@color/workspace_icon_text_color</item>
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">#B0000000</item>
@@ -77,7 +77,7 @@
</style>
<style name="WorkspaceIcon.Landscape">
- <item name="android:drawablePadding">2dp</item>
+ <item name="android:drawablePadding">@dimen/app_icon_drawable_padding_land</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">@dimen/app_icon_padding_top</item>