summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-07-08 15:34:52 -0700
committerWinson Chung <winsonc@google.com>2011-07-11 11:38:24 -0700
commit557d6ed50cc6560163440aa134870ef0bb11415b (patch)
tree9abf7ad514d60f696d902a97f937cc356dd47ee6 /res/values
parenta71cb1778dc0c7e76132d21296c58da777183e26 (diff)
downloadandroid_packages_apps_Trebuchet-557d6ed50cc6560163440aa134870ef0bb11415b.tar.gz
android_packages_apps_Trebuchet-557d6ed50cc6560163440aa134870ef0bb11415b.tar.bz2
android_packages_apps_Trebuchet-557d6ed50cc6560163440aa134870ef0bb11415b.zip
Fixing issues with spring loaded adding.
- Delaying until items are added - Showing bg when going into spring loaded mode - Fixing regression where dropping widgets on full page would not trigger a notification - Fixing regression on tablet where pages were no longer being rotated or shown Change-Id: Iadc0c406f0c065c5029addea1abfee395eed81b9
Diffstat (limited to 'res/values')
-rw-r--r--res/values/config.xml2
-rw-r--r--res/values/dimens.xml8
-rw-r--r--res/values/styles.xml29
3 files changed, 27 insertions, 12 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 497011c3c..f03ded71f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,6 +1,8 @@
<resources>
<bool name="config_hardwareAccelerated">true</bool>
<!-- AllApps/Customize/AppsCustomize -->
+ <!-- The alpha of the AppsCustomize bg in spring loaded mode -->
+ <integer name="config_appsCustomizeSpringLoadedBgAlpha">45</integer>
<!-- Fade in/out duration of icons being dragged from the trays -->
<integer name="config_dragAppsCustomizeIconFadeInDuration">150</integer>
<integer name="config_dragAppsCustomizeIconFadeOutDuration">200</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7353eda7d..c04dd8e06 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,19 +29,17 @@
<dimen name="toolbar_button_horizontal_padding">12dip</dimen>
<!-- AllApps/Customize/AppsCustomize -->
- <!-- Size of icons in Workspace/AppsCustomize -->
+ <dimen name="apps_customize_tab_bar_height">56dp</dimen>
<dimen name="app_icon_size">56dp</dimen>
+ <!-- The width can be 72dp because we don't have L/R padding -->
<dimen name="apps_customize_cell_width">72dp</dimen>
- <dimen name="apps_customize_cell_height">72dp</dimen>
+ <dimen name="apps_customize_cell_height">80dp</dimen>
<dimen name="apps_customize_peek_width">0dp</dimen>
<dimen name="apps_customize_max_gap">18dp</dimen>
<dimen name="apps_customize_widget_cell_width_gap">10dp</dimen>
<dimen name="apps_customize_widget_cell_height_gap">10dp</dimen>
<dimen name="title_texture_width">120px</dimen>
- <!-- height of the tab bar in AppsCustomize -->
- <dimen name="apps_customize_tab_bar_height">56dp</dimen>
-
<!-- height of the bottom row of controls -->
<dimen name="button_bar_height">56dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 06f6ed0f0..46e5f95a5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,12 +51,6 @@
<item name="android:shadowColor">#B0000000</item>
</style>
- <style name="WorkspaceIcon.AppsCustomize">
- <item name="android:background">@null</item>
- <item name="android:drawablePadding">0dp</item>
- <item name="android:includeFontPadding">false</item>
- </style>
-
<style name="WorkspaceIcon.Portrait">
<item name="android:drawablePadding">4dp</item>
<item name="android:paddingLeft">4dp</item>
@@ -72,16 +66,30 @@
<item name="android:paddingTop">2dp</item>
<item name="android:paddingBottom">4dp</item>
</style>
+
<style name="WorkspaceIcon.Portrait.Folder">
<item name="android:drawablePadding">0dp</item>
<item name="android:paddingTop">0dp</item>
</style>
-
<style name="WorkspaceIcon.Landscape.Folder">
<item name="android:drawablePadding">0dp</item>
<item name="android:paddingTop">0dp</item>
</style>
+ <style name="WorkspaceIcon.Portrait.AppsCustomize">
+ <item name="android:background">@null</item>
+ <item name="android:paddingLeft">0dp</item>
+ <item name="android:paddingRight">0dp</item>
+ <item name="android:drawablePadding">0dp</item>
+ <item name="android:includeFontPadding">false</item>
+ </style>
+ <style name="WorkspaceIcon.Landscape.AppsCustomize">
+ <item name="android:background">@null</item>
+ <item name="android:paddingBottom">0dp</item>
+ <item name="android:drawablePadding">0dp</item>
+ <item name="android:includeFontPadding">false</item>
+ </style>
+
<style name="SearchDropTargetBar">
<item name="android:orientation">horizontal</item>
<item name="android:layout_width">match_parent</item>
@@ -111,6 +119,10 @@
<item name="android:drawablePadding">7.5dp</item>
<item name="android:textColor">#FFFFFFFF</item>
<item name="android:textSize">16sp</item>
+ <item name="android:shadowColor">#393939</item>
+ <item name="android:shadowDx">0.0</item>
+ <item name="android:shadowDy">0.0</item>
+ <item name="android:shadowRadius">2.0</item>
</style>
<style name="TabIndicator">
@@ -129,6 +141,9 @@
<item name="android:shadowDy">1.0</item>
<item name="android:shadowRadius">1.0</item>
</style>
+ <style name="TabIndicator.AppsCustomize">
+ <!-- Overridden in values-land -->
+ </style>
<style name="MarketButton">
<item name="android:paddingLeft">5dp</item>