From eecf02da58adef5486bf0c9ff7127ea891f457a4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 2 Mar 2012 17:14:58 -0800
Subject: Fixing some issues/regressions related to scaled icons.

- Fixes issue with folder icons being clipped in landscape in sw720dp (Bug: 6118397)
- Fixes issue with divider being in wrong orientation in sw720dp
- Fixes issue with scaled icons not being drawn with filtering
- Fixes issue with side pages showing under the hotseat when in landscape in phone UI
- Animates the drag view on pick up and drop

Change-Id: Iad26427ec63fcbc9bdb3b29a4645689ba445d5c8
---
 .../divider_launcher_holo.9.png                          | Bin 0 -> 199 bytes
 .../divider_launcher_holo.9.png                          | Bin 0 -> 1078 bytes
 res/values-land/dimens.xml                               |   2 +-
 res/values-sw600dp-land/dimens.xml                       |   2 +-
 res/values-sw720dp/dimens.xml                            |   5 ++++-
 res/values/dimens.xml                                    |   4 ++--
 6 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable-sw720dp-land-hdpi/divider_launcher_holo.9.png
 create mode 100644 res/drawable-sw720dp-land-mdpi/divider_launcher_holo.9.png

(limited to 'res')

diff --git a/res/drawable-sw720dp-land-hdpi/divider_launcher_holo.9.png b/res/drawable-sw720dp-land-hdpi/divider_launcher_holo.9.png
new file mode 100644
index 000000000..0a1bd2a26
Binary files /dev/null and b/res/drawable-sw720dp-land-hdpi/divider_launcher_holo.9.png differ
diff --git a/res/drawable-sw720dp-land-mdpi/divider_launcher_holo.9.png b/res/drawable-sw720dp-land-mdpi/divider_launcher_holo.9.png
new file mode 100644
index 000000000..6d101f4ce
Binary files /dev/null and b/res/drawable-sw720dp-land-mdpi/divider_launcher_holo.9.png differ
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index b4ddc0058..5f03510f3 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -33,7 +33,7 @@
     <dimen name="workspace_bottom_padding">0dp</dimen>
     <!-- We really want the page spacing to be the max of either the button bar
          height or the qsb bar height -->
-    <dimen name="workspace_page_spacing">@dimen/button_bar_height</dimen>
+    <dimen name="workspace_page_spacing">-1dp</dimen>
     <dimen name="workspace_divider_padding_left">0dp</dimen>
     <dimen name="workspace_divider_padding_right">0dp</dimen>
     <dimen name="workspace_divider_padding_top">12dp</dimen>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 882de23ce..7db0a8adb 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -21,7 +21,7 @@
 
 <!-- Hotseat -->
     <dimen name="hotseat_cell_width">75dp</dimen>
-    <dimen name="hotseat_cell_height">85dp</dimen>
+    <dimen name="hotseat_cell_height">75dp</dimen>
 
 <!-- Workspace -->
     <dimen name="workspace_cell_width">96dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 0fb8d3396..62bf9a862 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -27,6 +27,9 @@
     <dimen name="workspace_cell_width">96dip</dimen>
     <dimen name="workspace_cell_height">96dip</dimen>
 
+    <dimen name="folder_cell_width">96dp</dimen>
+    <dimen name="folder_cell_height">96dp</dimen>
+
 <!-- AppsCustomize -->
     <integer name="apps_customize_maxCellCountX">-1</integer>
     <integer name="apps_customize_maxCellCountY">-1</integer>
@@ -49,5 +52,5 @@
     <!-- When dragging items on the workspace, the number of dps by which the position of
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
-    <dimen name="dragViewOffsetY">-12dp</dimen>
+    <dimen name="dragViewOffsetY">0dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4a69f4aba..45e544a7c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -102,10 +102,10 @@
     <!-- When dragging items on the workspace, the number of dps by which the position of
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
-    <dimen name="dragViewOffsetY">-8dp</dimen>
+    <dimen name="dragViewOffsetY">0dp</dimen>
     <!--  When dragging an item, how much bigger (fixed dps) the dragged view
           should be. If 0, it will not be scaled at all. -->
-    <dimen name="dragViewScale">8dp</dimen>
+    <dimen name="dragViewScale">12dp</dimen>
 
     <!-- Padding applied to AppWidgets -->
     <dimen name="app_widget_preview_padding_left">8dp</dimen>
-- 
cgit v1.2.3