From 61fa4197c4316bb0f9b05fcefb676f86197a2273 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 12 Jun 2011 15:15:29 -0700
Subject: Fixing drop target area, and adding bg color indicators.

- Merging wallpaper fix and PagedViewIconCache key fix

Change-Id: I2a65bc4b642f020dfc4d2223a36d3ebcf41de5f5
---
 res/values/colors.xml | 4 ++--
 res/values/config.xml | 3 +++
 res/values/styles.xml | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'res/values')

diff --git a/res/values/colors.xml b/res/values/colors.xml
index e14fbfe37..fd7b21c35 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,8 +20,8 @@
 <resources>
     <!-- The color tints to apply to the text and drag view when hovering
          over the delete target or the info target -->
-    <color name="delete_target_hover_tint">#A5FF0000</color>
-    <color name="info_target_hover_tint">#A50000FE</color>
+    <color name="delete_target_hover_tint">#D4FF3600</color>
+    <color name="info_target_hover_tint">#D40078FF</color>
 
     <color name="window_background">#FF191919</color>
     <color name="grid_dark_background">#EB191919</color>     
diff --git a/res/values/config.xml b/res/values/config.xml
index 394ff8afa..06e8fdad8 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -43,6 +43,9 @@
     <integer name="config_allAppsBatchSize">0</integer>
 
 <!-- Workspace -->
+    <!-- The transition duration for the background of the drop targets -->
+    <integer name="config_dropTargetBgTransitionDuration">100</integer>
+
     <integer name="config_crosshairsFadeInTime">600</integer>
 
     <!--  When dragging an item on the workspace, how much bigger (in pixels) the dragged view
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 176bab572..5c458b408 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -93,12 +93,12 @@
     </style>
     <style name="DropTargetButton">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
-        <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
-        <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
+        <item name="android:textColor">#FFFFFFFF</item>
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="TabIndicator">
-- 
cgit v1.2.3