summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-10-19 21:36:08 -0700
committerWinson Chung <winsonc@google.com>2011-10-19 23:57:04 -0700
commitb8c69f3c17a40adc2d85e8e996f754c383c293dc (patch)
treee29218ccbd4ce9345c3706d5c9fe15ccff17f780 /res
parentfa4656a60b6a9e2f9b21a575c11a1d5c6e6771fc (diff)
downloadandroid_packages_apps_Trebuchet-b8c69f3c17a40adc2d85e8e996f754c383c293dc.tar.gz
android_packages_apps_Trebuchet-b8c69f3c17a40adc2d85e8e996f754c383c293dc.tar.bz2
android_packages_apps_Trebuchet-b8c69f3c17a40adc2d85e8e996f754c383c293dc.zip
Fixing issue where holographic outlines were offset when dragging from/to folders/hotseat. (Bug: 5399792)
Change-Id: Iaa39ef1293b45a1d116210ec9d7fbde17dbc99cc
Diffstat (limited to 'res')
-rw-r--r--res/values-land/dimens.xml2
-rw-r--r--res/values-sw600dp/dimens.xml2
-rw-r--r--res/values-sw600dp/styles.xml4
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/styles.xml4
5 files changed, 10 insertions, 4 deletions
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 4bb64f71d..c4aef8ba3 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -37,6 +37,8 @@
<dimen name="workspace_divider_padding_top">12dp</dimen>
<dimen name="workspace_divider_padding_bottom">12dp</dimen>
+ <dimen name="app_icon_padding_top">6dp</dimen>
+
<!-- height of the bottom row of controls -->
<dimen name="button_bar_height">68dip</dimen>
<!-- Because portal animations go beyond the bounds of an icon, we need
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 1b806a647..544b970f7 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -29,6 +29,8 @@
<dimen name="folder_cell_width">96dp</dimen>
<dimen name="folder_cell_height">96dp</dimen>
+ <dimen name="app_icon_padding_top">4dp</dimen>
+
<!-- AppsCustomize -->
<dimen name="apps_customize_tab_bar_height">56dp</dimen>
<dimen name="apps_customize_cell_width">96dp</dimen>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 31c2abdbe..060900295 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -23,7 +23,7 @@
<item name="android:drawablePadding">0dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
- <item name="android:paddingTop">4dp</item>
+ <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:textSize">13sp</item>
</style>
@@ -38,7 +38,7 @@
<item name="android:drawablePadding">0dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
- <item name="android:paddingTop">4dp</item>
+ <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:textSize">13sp</item>
</style>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 27e00b31a..124cf16b2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -42,6 +42,8 @@
<dimen name="hotseat_height_gap">-1dp</dimen>
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
+ <dimen name="app_icon_padding_top">8dp</dimen>
+
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">0dip</dimen>
<dimen name="toolbar_button_horizontal_padding">12dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 04bddf19d..f575f0057 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -72,7 +72,7 @@
<item name="android:drawablePadding">8dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
- <item name="android:paddingTop">8dp</item>
+ <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
<item name="android:paddingBottom">4dp</item>
</style>
@@ -80,7 +80,7 @@
<item name="android:drawablePadding">2dp</item>
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
- <item name="android:paddingTop">6dp</item>
+ <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
<item name="android:paddingBottom">4dp</item>
</style>