From b26f3d6a8c62e7c1a603b6c7979375d8dd4f20d4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 2 Jun 2011 10:49:29 -0700
Subject: Modifying AppsCustomize behaviour to use springloaded mode.

Change-Id: I21d181ad3d245731ee8402915f8918b91bfc4553
---
 res/drawable-hdpi/all_apps_bg_gradient.png               | Bin 0 -> 2792 bytes
 res/drawable-hdpi/homescreen_large_blue.9.png            | Bin 0 -> 3387 bytes
 res/drawable-hdpi/homescreen_large_blue_strong.9.png     | Bin 0 -> 4520 bytes
 res/drawable-hdpi/homescreen_large_green.9.png           | Bin 0 -> 3368 bytes
 res/drawable-hdpi/homescreen_large_green_strong.9.png    | Bin 0 -> 4499 bytes
 res/drawable-hdpi/homescreen_small_blue.9.png            | Bin 0 -> 6411 bytes
 res/drawable-hdpi/homescreen_small_blue_strong.9.png     | Bin 0 -> 5470 bytes
 res/drawable-hdpi/homescreen_small_green_strong.9.png    | Bin 0 -> 5662 bytes
 res/drawable-large-hdpi/homescreen_large_blue.9.png      | Bin 895 -> 0 bytes
 .../homescreen_large_blue_strong.9.png                   | Bin 2062 -> 0 bytes
 res/drawable-large-hdpi/homescreen_large_green.9.png     | Bin 877 -> 0 bytes
 .../homescreen_large_green_strong.9.png                  | Bin 2036 -> 0 bytes
 res/drawable-large-hdpi/homescreen_small_blue.9.png      | Bin 4578 -> 0 bytes
 .../homescreen_small_blue_strong.9.png                   | Bin 3075 -> 0 bytes
 res/drawable-large-hdpi/homescreen_small_green.9.png     | Bin 2578 -> 0 bytes
 .../homescreen_small_green_strong.9.png                  | Bin 3263 -> 0 bytes
 res/drawable-large-mdpi/homescreen_large_blue.9.png      | Bin 647 -> 0 bytes
 res/drawable-large-mdpi/homescreen_large_green.9.png     | Bin 645 -> 0 bytes
 .../homescreen_large_green_strong.9.png                  | Bin 1639 -> 0 bytes
 res/drawable-large-mdpi/homescreen_small_blue.9.png      | Bin 3600 -> 0 bytes
 .../homescreen_small_blue_strong.9.png                   | Bin 2446 -> 0 bytes
 res/drawable-large-mdpi/homescreen_small_green.9.png     | Bin 1881 -> 0 bytes
 .../homescreen_small_green_strong.9.png                  | Bin 2591 -> 0 bytes
 res/drawable-mdpi/all_apps_bg_gradient.png               | Bin 0 -> 2792 bytes
 res/drawable-mdpi/homescreen_large_blue.9.png            | Bin 0 -> 647 bytes
 res/drawable-mdpi/homescreen_large_green.9.png           | Bin 0 -> 645 bytes
 res/drawable-mdpi/homescreen_large_green_strong.9.png    | Bin 0 -> 1639 bytes
 res/drawable-mdpi/homescreen_small_blue.9.png            | Bin 0 -> 3600 bytes
 res/drawable-mdpi/homescreen_small_blue_strong.9.png     | Bin 0 -> 2446 bytes
 res/drawable-mdpi/homescreen_small_green_strong.9.png    | Bin 0 -> 2591 bytes
 res/layout/apps_customize_pane.xml                       |   7 +++++--
 res/values-large/config.xml                              |  10 ++--------
 res/values/config.xml                                    |  10 ++++++++++
 33 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 res/drawable-hdpi/all_apps_bg_gradient.png
 create mode 100644 res/drawable-hdpi/homescreen_large_blue.9.png
 create mode 100644 res/drawable-hdpi/homescreen_large_blue_strong.9.png
 create mode 100644 res/drawable-hdpi/homescreen_large_green.9.png
 create mode 100644 res/drawable-hdpi/homescreen_large_green_strong.9.png
 create mode 100644 res/drawable-hdpi/homescreen_small_blue.9.png
 create mode 100644 res/drawable-hdpi/homescreen_small_blue_strong.9.png
 create mode 100644 res/drawable-hdpi/homescreen_small_green_strong.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_large_blue.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_large_blue_strong.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_large_green.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_large_green_strong.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_small_blue.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_small_blue_strong.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_small_green.9.png
 delete mode 100644 res/drawable-large-hdpi/homescreen_small_green_strong.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_large_blue.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_large_green.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_large_green_strong.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_small_blue.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_small_blue_strong.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_small_green.9.png
 delete mode 100644 res/drawable-large-mdpi/homescreen_small_green_strong.9.png
 create mode 100644 res/drawable-mdpi/all_apps_bg_gradient.png
 create mode 100644 res/drawable-mdpi/homescreen_large_blue.9.png
 create mode 100644 res/drawable-mdpi/homescreen_large_green.9.png
 create mode 100644 res/drawable-mdpi/homescreen_large_green_strong.9.png
 create mode 100644 res/drawable-mdpi/homescreen_small_blue.9.png
 create mode 100644 res/drawable-mdpi/homescreen_small_blue_strong.9.png
 create mode 100644 res/drawable-mdpi/homescreen_small_green_strong.9.png

(limited to 'res')

diff --git a/res/drawable-hdpi/all_apps_bg_gradient.png b/res/drawable-hdpi/all_apps_bg_gradient.png
new file mode 100644
index 000000000..c420ca567
Binary files /dev/null and b/res/drawable-hdpi/all_apps_bg_gradient.png differ
diff --git a/res/drawable-hdpi/homescreen_large_blue.9.png b/res/drawable-hdpi/homescreen_large_blue.9.png
new file mode 100644
index 000000000..416514dbe
Binary files /dev/null and b/res/drawable-hdpi/homescreen_large_blue.9.png differ
diff --git a/res/drawable-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-hdpi/homescreen_large_blue_strong.9.png
new file mode 100644
index 000000000..d7e32e796
Binary files /dev/null and b/res/drawable-hdpi/homescreen_large_blue_strong.9.png differ
diff --git a/res/drawable-hdpi/homescreen_large_green.9.png b/res/drawable-hdpi/homescreen_large_green.9.png
new file mode 100644
index 000000000..60042c2dd
Binary files /dev/null and b/res/drawable-hdpi/homescreen_large_green.9.png differ
diff --git a/res/drawable-hdpi/homescreen_large_green_strong.9.png b/res/drawable-hdpi/homescreen_large_green_strong.9.png
new file mode 100644
index 000000000..c40b98ee2
Binary files /dev/null and b/res/drawable-hdpi/homescreen_large_green_strong.9.png differ
diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/homescreen_small_blue.9.png
new file mode 100644
index 000000000..ddc458ba2
Binary files /dev/null and b/res/drawable-hdpi/homescreen_small_blue.9.png differ
diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png
new file mode 100644
index 000000000..8f5a74efc
Binary files /dev/null and b/res/drawable-hdpi/homescreen_small_blue_strong.9.png differ
diff --git a/res/drawable-hdpi/homescreen_small_green_strong.9.png b/res/drawable-hdpi/homescreen_small_green_strong.9.png
new file mode 100644
index 000000000..77baa5296
Binary files /dev/null and b/res/drawable-hdpi/homescreen_small_green_strong.9.png differ
diff --git a/res/drawable-large-hdpi/homescreen_large_blue.9.png b/res/drawable-large-hdpi/homescreen_large_blue.9.png
deleted file mode 100644
index 6ce3d29fb..000000000
Binary files a/res/drawable-large-hdpi/homescreen_large_blue.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png
deleted file mode 100644
index 811014826..000000000
Binary files a/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_large_green.9.png b/res/drawable-large-hdpi/homescreen_large_green.9.png
deleted file mode 100644
index 4a6546ee4..000000000
Binary files a/res/drawable-large-hdpi/homescreen_large_green.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_large_green_strong.9.png b/res/drawable-large-hdpi/homescreen_large_green_strong.9.png
deleted file mode 100644
index 5ba9ebe79..000000000
Binary files a/res/drawable-large-hdpi/homescreen_large_green_strong.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_small_blue.9.png b/res/drawable-large-hdpi/homescreen_small_blue.9.png
deleted file mode 100644
index db93b3ccd..000000000
Binary files a/res/drawable-large-hdpi/homescreen_small_blue.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png
deleted file mode 100644
index 32bd857d3..000000000
Binary files a/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_small_green.9.png b/res/drawable-large-hdpi/homescreen_small_green.9.png
deleted file mode 100644
index 00baae948..000000000
Binary files a/res/drawable-large-hdpi/homescreen_small_green.9.png and /dev/null differ
diff --git a/res/drawable-large-hdpi/homescreen_small_green_strong.9.png b/res/drawable-large-hdpi/homescreen_small_green_strong.9.png
deleted file mode 100644
index e1e64c57a..000000000
Binary files a/res/drawable-large-hdpi/homescreen_small_green_strong.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_large_blue.9.png b/res/drawable-large-mdpi/homescreen_large_blue.9.png
deleted file mode 100644
index 5e7e61f27..000000000
Binary files a/res/drawable-large-mdpi/homescreen_large_blue.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_large_green.9.png b/res/drawable-large-mdpi/homescreen_large_green.9.png
deleted file mode 100644
index 2f83bac7d..000000000
Binary files a/res/drawable-large-mdpi/homescreen_large_green.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_large_green_strong.9.png b/res/drawable-large-mdpi/homescreen_large_green_strong.9.png
deleted file mode 100644
index 1e145029b..000000000
Binary files a/res/drawable-large-mdpi/homescreen_large_green_strong.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_small_blue.9.png b/res/drawable-large-mdpi/homescreen_small_blue.9.png
deleted file mode 100644
index 28bc33b18..000000000
Binary files a/res/drawable-large-mdpi/homescreen_small_blue.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png
deleted file mode 100644
index f286de9fe..000000000
Binary files a/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_small_green.9.png b/res/drawable-large-mdpi/homescreen_small_green.9.png
deleted file mode 100644
index 58698ea8d..000000000
Binary files a/res/drawable-large-mdpi/homescreen_small_green.9.png and /dev/null differ
diff --git a/res/drawable-large-mdpi/homescreen_small_green_strong.9.png b/res/drawable-large-mdpi/homescreen_small_green_strong.9.png
deleted file mode 100644
index 977308579..000000000
Binary files a/res/drawable-large-mdpi/homescreen_small_green_strong.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/all_apps_bg_gradient.png b/res/drawable-mdpi/all_apps_bg_gradient.png
new file mode 100644
index 000000000..c420ca567
Binary files /dev/null and b/res/drawable-mdpi/all_apps_bg_gradient.png differ
diff --git a/res/drawable-mdpi/homescreen_large_blue.9.png b/res/drawable-mdpi/homescreen_large_blue.9.png
new file mode 100644
index 000000000..5e7e61f27
Binary files /dev/null and b/res/drawable-mdpi/homescreen_large_blue.9.png differ
diff --git a/res/drawable-mdpi/homescreen_large_green.9.png b/res/drawable-mdpi/homescreen_large_green.9.png
new file mode 100644
index 000000000..2f83bac7d
Binary files /dev/null and b/res/drawable-mdpi/homescreen_large_green.9.png differ
diff --git a/res/drawable-mdpi/homescreen_large_green_strong.9.png b/res/drawable-mdpi/homescreen_large_green_strong.9.png
new file mode 100644
index 000000000..1e145029b
Binary files /dev/null and b/res/drawable-mdpi/homescreen_large_green_strong.9.png differ
diff --git a/res/drawable-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/homescreen_small_blue.9.png
new file mode 100644
index 000000000..28bc33b18
Binary files /dev/null and b/res/drawable-mdpi/homescreen_small_blue.9.png differ
diff --git a/res/drawable-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png
new file mode 100644
index 000000000..f286de9fe
Binary files /dev/null and b/res/drawable-mdpi/homescreen_small_blue_strong.9.png differ
diff --git a/res/drawable-mdpi/homescreen_small_green_strong.9.png b/res/drawable-mdpi/homescreen_small_green_strong.9.png
new file mode 100644
index 000000000..977308579
Binary files /dev/null and b/res/drawable-mdpi/homescreen_small_green_strong.9.png differ
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index 604dff4f8..f3ecb4824 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -16,11 +16,14 @@
 <com.android.launcher2.AppsCustomizeTabHost
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+    <com.android.launcher2.AllAppsBackground
+        android:id="@+id/all_apps_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#FF000000">
+        android:layout_height="match_parent">
         <!-- The layout_width of the tab bar gets overriden to align the content
              with the text in the tabs in AppsCustomizeTabHost. -->
         <FrameLayout
diff --git a/res/values-large/config.xml b/res/values-large/config.xml
index 8b7769659..dca8282ab 100644
--- a/res/values-large/config.xml
+++ b/res/values-large/config.xml
@@ -6,6 +6,8 @@
     <integer name="config_customizeZoomOutTime">600</integer>
     <integer name="config_customizeZoomScaleFactor">7</integer>
     <integer name="config_customizeFadeInTime">800</integer>
+    <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
+    <integer name="config_workspaceSpringLoadShrinkPercentage">70</integer>
 
     <!-- The slope, in percent, of the drag movement needed to drag an item out of
          Customize (y / x * 100%)  -->
@@ -24,12 +26,4 @@
     <!-- When shrinking the workspace, this is the percentage of its original size. -->
     <integer name="config_workspaceShrinkPercent">17</integer>
 
-    <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation
-         of the bright green hover outline, and then fade out the outline at the end. These are
-         the values used in that animation -->
-    <integer name="config_screenOnDropScalePercent">120</integer>
-    <integer name="config_screenOnDropScaleUpDuration">200</integer>
-    <integer name="config_screenOnDropScaleDownDuration">200</integer>
-    <integer name="config_screenOnDropAlphaFadeDelay">350</integer>
-    <integer name="config_screenOnDropAlphaFadeDuration">50</integer>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 44ba589c8..394ff8afa 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -5,6 +5,16 @@
     <integer name="config_dragAppsCustomizeIconFadeOutDuration">200</integer>
     <integer name="config_dragAppsCustomizeIconFadeAlpha">100</integer>
     <integer name="config_workspaceUnshrinkTime">650</integer>
+    <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
+    <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer>
+    <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation
+         of the bright green hover outline, and then fade out the outline at the end. These are
+         the values used in that animation -->
+    <integer name="config_screenOnDropScalePercent">120</integer>
+    <integer name="config_screenOnDropScaleUpDuration">200</integer>
+    <integer name="config_screenOnDropScaleDownDuration">200</integer>
+    <integer name="config_screenOnDropAlphaFadeDelay">350</integer>
+    <integer name="config_screenOnDropAlphaFadeDuration">50</integer>
 
     <!-- Fade/zoom in/out duration & scale in the AllApps transition.
          Note: This should be less than the workspaceShrinkTime as they happen together. -->
-- 
cgit v1.2.3