summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-07-22 11:16:13 -0700
committerWinson Chung <winsonc@google.com>2011-07-25 12:06:43 -0700
commitf5f8cefb215fad98ae6d4487852e8b948aba3619 (patch)
treefb3221add7c88e1480e2f9aae0177c2d9137c151 /res/values
parentf4bb1cdecd3cf866a1d87b7b8560234fa7dd4cc5 (diff)
downloadandroid_packages_apps_Trebuchet-f5f8cefb215fad98ae6d4487852e8b948aba3619.tar.gz
android_packages_apps_Trebuchet-f5f8cefb215fad98ae6d4487852e8b948aba3619.tar.bz2
android_packages_apps_Trebuchet-f5f8cefb215fad98ae6d4487852e8b948aba3619.zip
Launcher cleanup and fixes.
- Removing unused hotseat assets - Adding xhdpi assets from designer repo - Decoupling dock divider and scroll bar to fix landscape divider issue - Fixing issue where dock portals were being clipped Change-Id: If3894a9a265e0272111e852857f9cfbf994ec050
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml11
-rw-r--r--res/values/attrs.xml3
-rw-r--r--res/values/dimens.xml10
3 files changed, 11 insertions, 13 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
deleted file mode 100644
index 6bd16ed86..000000000
--- a/res/values/arrays.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string-array name="hotseats" translatable="false">
- <item>intent:#Intent;action=android.intent.action.DIAL;end</item>
- <item>*BROWSER*</item>
- </string-array>
- <array name="hotseat_icons" translatable="false">
- <item>@drawable/hotseat_phone</item>
- <item>@drawable/hotseat_browser</item>
- </array>
-</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e093e36f8..43591035f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -108,6 +108,9 @@
<attr name="pageLayoutPaddingRight" format="dimension" />
<!-- The space between adjacent pages of the PagedView. -->
<attr name="pageSpacing" format="dimension" />
+ <!-- The padding for the scroll indicator area -->
+ <attr name="scrollIndicatorPaddingLeft" format="dimension" />
+ <attr name="scrollIndicatorPaddingRight" format="dimension" />
</declare-styleable>
<!-- AppsCustomizePagedView specific attributes. These attributes are used to
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 44da3521c..215f698e3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,8 +24,10 @@
<dimen name="workspace_max_gap">8dp</dimen>
<dimen name="folder_cell_width">74dp</dimen>
<dimen name="folder_cell_height">80dp</dimen>
- <dimen name="scroll_track_padding_left">12dp</dimen>
- <dimen name="scroll_track_padding_right">12dp</dimen>
+ <dimen name="dock_divider_padding_left">12dp</dimen>
+ <dimen name="dock_divider_padding_right">12dp</dimen>
+ <dimen name="dock_divider_padding_top">0dp</dimen>
+ <dimen name="dock_divider_padding_bottom">0dp</dimen>
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">0dip</dimen>
@@ -45,6 +47,10 @@
<!-- height of the bottom row of controls -->
<dimen name="button_bar_height">80dip</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>
<!-- Drag padding to add to the drop targets -->
<dimen name="drop_target_drag_padding">20dp</dimen>