summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-04 16:14:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-04 16:14:13 -0700
commit02765c94268d7dc3531c87a638a184a3b481ad40 (patch)
treeec93521963249345489e0bc1cf3a1f7b52291b8e /res/values
parent7bdb25a9894970da74248c9cdc606d0e1ba05c99 (diff)
parentea359c6aee44c0fe3bb94f7002c3b49208b32b7f (diff)
downloadandroid_packages_apps_Trebuchet-02765c94268d7dc3531c87a638a184a3b481ad40.tar.gz
android_packages_apps_Trebuchet-02765c94268d7dc3531c87a638a184a3b481ad40.tar.bz2
android_packages_apps_Trebuchet-02765c94268d7dc3531c87a638a184a3b481ad40.zip
Merge "Grid spacing fixes"
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml7
-rw-r--r--res/values/dimens.xml10
2 files changed, 6 insertions, 11 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 71f282c97..1efeb9e49 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -27,13 +27,6 @@
<color name="appwidget_error_color">#FCCC</color>
- <color name="drag_outline_color">#6595f9</color>
-
- <color name="workspace_item_pressed_outline_color">#6595f9</color>
- <color name="workspace_item_pressed_glow_color">#0997ff</color>
- <color name="workspace_item_focused_outline_color">#6595f9</color>
- <color name="workspace_item_focused_glow_color">#0997ff</color>
-
<color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color>
<color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cb354b4b3..eab4044e5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,9 +16,11 @@
<resources>
<!-- Workspace -->
- <dimen name="qsb_bar_height">48dp</dimen>
+ <dimen name="qsb_bar_height">40dp</dimen>
<dimen name="workspace_cell_width">80dp</dimen>
- <dimen name="workspace_cell_height">80dp</dimen>
+ <dimen name="workspace_cell_height">100dp</dimen>
+ <dimen name="hotseat_cell_width">80dp</dimen>
+ <dimen name="hotseat_cell_height">64dp</dimen>
<dimen name="workspace_width_gap">-1dp</dimen>
<dimen name="workspace_height_gap">-1dp</dimen>
<dimen name="workspace_max_gap">16dp</dimen>
@@ -46,11 +48,11 @@
<dimen name="title_texture_width">120px</dimen>
<!-- height of the bottom row of controls -->
- <dimen name="button_bar_height">80dip</dimen>
+ <dimen name="button_bar_height">64dip</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_padding">8dp</dimen>
- <dimen name="button_bar_height_plus_padding">88dp</dimen>
+ <dimen name="button_bar_height_plus_padding">72dp</dimen>
<!-- Drag padding to add to the drop targets -->
<dimen name="drop_target_drag_padding">40dp</dimen>