diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-07 17:04:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-07 17:04:57 -0800 |
| commit | 633f1aad55aea7afbefd8409ccfd1f693b27870b (patch) | |
| tree | c0ed8c754aff5efa62aafadf3ff6a1bb1623a054 /res | |
| parent | 9e371e95f1348041abdd9b197f7ad8a9c2bcb766 (diff) | |
| parent | 989dc51400f4511e8411b0f1e6c525c024fbb949 (diff) | |
| download | android_packages_apps_Trebuchet-633f1aad55aea7afbefd8409ccfd1f693b27870b.tar.gz android_packages_apps_Trebuchet-633f1aad55aea7afbefd8409ccfd1f693b27870b.tar.bz2 android_packages_apps_Trebuchet-633f1aad55aea7afbefd8409ccfd1f693b27870b.zip | |
am 989dc514: am bc239a15: Scale icons down for sw600dp-land mode.
* commit '989dc51400f4511e8411b0f1e6c525c024fbb949':
Scale icons down for sw600dp-land mode.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-sw600dp-land/dimens.xml | 6 | ||||
| -rw-r--r-- | res/values-sw600dp-port/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values-sw720dp/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 0e7d63cd2..882de23ce 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -15,8 +15,9 @@ --> <resources> - <dimen name="app_icon_size">65dp</dimen> - <dimen name="app_icon_padding_top">2dp</dimen> + <dimen name="app_icon_padding_top">0dp</dimen> + <dimen name="app_icon_drawable_padding_land">0dp</dimen> + <integer name="app_icon_scale_percent">90</integer> <!-- Hotseat --> <dimen name="hotseat_cell_width">75dp</dimen> @@ -27,6 +28,7 @@ <dimen name="workspace_cell_height">86dp</dimen> <dimen name="workspace_width_gap">32dp</dimen> <dimen name="workspace_height_gap">0dp</dimen> + <dimen name="workspace_icon_text_size">11sp</dimen> <!-- Folders --> <!-- The size of the image which sits behind the preview of the folder contents --> diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml index 8e8455d0e..956599248 100644 --- a/res/values-sw600dp-port/dimens.xml +++ b/res/values-sw600dp-port/dimens.xml @@ -16,6 +16,7 @@ <resources> <!-- Workspace --> + <integer name="app_icon_scale_percent">-1</integer> <dimen name="workspace_width_gap">0dp</dimen> <dimen name="workspace_height_gap">32dp</dimen> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index a6402ae79..0fb8d3396 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -34,7 +34,7 @@ <dimen name="app_widget_preview_padding_top">10dp</dimen> <!-- Size of icons in workspace --> - <dimen name="app_icon_size">72dp</dimen> + <integer name="app_icon_scale_percent">-1</integer> <integer name="app_icon_hotseat_scale_percent">-1</integer> <dimen name="all_apps_button_vertical_padding">4dip</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 890e2167a..4a69f4aba 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> |