From 9d9d74f2b0927b9b28ac70d453c046d48788b57b Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 19 Sep 2011 11:49:12 -0700
Subject: [PATCH] Launcher tweaks.

- Updating search bar bg
- Removing clings from the layout if they are already dismissed
- Tweaking cling description paddings for languages that are more verbase
- Tweaking wallpaper picker gallery spacing

Change-Id: I801cdf4b1d0cc49a53113318d7b9075f6fa218bd
---
 res/drawable-hdpi/grid_focused.9.png     | Bin 200 -> 196 bytes
 res/drawable-hdpi/grid_pressed.9.png     | Bin 184 -> 200 bytes
 res/drawable-hdpi/grid_selected.9.png    | Bin 202 -> 204 bytes
 res/drawable-hdpi/search_bg_panel.9.png  | Bin 219 -> 177 bytes
 res/drawable-mdpi/grid_focused.9.png     | Bin 170 -> 176 bytes
 res/drawable-mdpi/grid_pressed.9.png     | Bin 165 -> 170 bytes
 res/drawable-mdpi/grid_selected.9.png    | Bin 165 -> 169 bytes
 res/drawable-mdpi/search_bg_panel.9.png  | Bin 196 -> 162 bytes
 res/drawable-xhdpi/grid_focused.9.png    | Bin 193 -> 196 bytes
 res/drawable-xhdpi/grid_pressed.9.png    | Bin 190 -> 193 bytes
 res/drawable-xhdpi/grid_selected.9.png   | Bin 199 -> 193 bytes
 res/drawable-xhdpi/search_bg_panel.9.png | Bin 255 -> 198 bytes
 res/layout-port/workspace_cling.xml      |   3 ++
 res/layout/wallpaper_chooser.xml         |   2 +-
 src/com/android/launcher2/Cling.java     |  15 +--------
 src/com/android/launcher2/Launcher.java  |  37 ++++++++++++++++-------
 16 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/res/drawable-hdpi/grid_focused.9.png b/res/drawable-hdpi/grid_focused.9.png
index cb5aea89aaa9af7df366fe1bd00c9165a34fdb22..f6ae2672ab7b545381467e87891d50cfc5b3664f 100644
GIT binary patch
delta 130
zcmV-|0Db?+0mK22Nqc5VL_t&-m7S2$34lNhLzCkMxgB(M2k>8a@W(mg&sj^cau^7d
z^cC7d5`yIXgc2%AOv|~se0R0wB<JcHM|V`~MugWF_#RM+yM3vQg1=yn!v4UPFqTI+
k8vp=O5=h%5`wS)F0@!mJze^p5K>z>%07*qoM6N<$f)xNb&j0`b

delta 134
zcmV;10D1q!0muQ6Nq=fdL_t&-m7S2m4S+BV1J9`Alo!)5ArmkOU4c2w0|Zei2w};e
z<SfO(HkBNF4Q-MnhIzduLJ$B+N@1}8r4h(L4-nx3ObvKEV0ZOxZ|c5+zhHfZW5LW`
ordDpj{oyA`wvo<Do<1YnY++U!@Z$O)2><{907*qoM6N<$g7dF7Y5)KL

diff --git a/res/drawable-hdpi/grid_pressed.9.png b/res/drawable-hdpi/grid_pressed.9.png
index 548accef60c570558041c6a66a65e16a035c5b38..cb5aea89aaa9af7df366fe1bd00c9165a34fdb22 100644
GIT binary patch
delta 134
zcmV;10D1qo0muQ6Nq=fdL_t&-m7S2m4S+BV1J9`Alo!)5ArmkOU4c2w0|Zei2w};e
z<SfO(HkBNF4Q-MnhIzduLJ$B+N@1}8r4h(L4-nx3ObvKEV0ZOxZ|c5+zhHfZW5LW`
ordDpj{oyA`wvo<Do<1YnY++U!@Z$O)2><{907*qoM6N<$g6(HEUH||9

delta 118
zcmV-+0Ez#|0k{E>NpD(7L_t&-m9>%434kyVLtmsDIf%3N!;zdL{wUU1g?<<~4nh*b
z9kvO$nTxb3l9<=+;b@EiNYeBo>S9P-vKz1*oPgR^>Lok&XAQ-^)lj6=6rJY(uEEF$
YcYqQdiRbqp*Z=?k07*qoM6N<$f>>fT_y7O^

diff --git a/res/drawable-hdpi/grid_selected.9.png b/res/drawable-hdpi/grid_selected.9.png
index 02ab90253406f667bef5dae196c4798c2a449716..add46a73b92f082c14711a723ba3a16f3ff6d427 100644
GIT binary patch
delta 139
zcmV;60CfM#0n7oANq=rhL_t&-m7S2m4S*mFMSqD~aA5})@Xk^!#oYzi!HaWzFOAj)
z4e=%aK>JAAf+QR?xr-zO0CGF3|KaH+*2TPcjVEdFkb8-nH*-5yl^OhOUxZolmn^fg
tT`=h~o-~wgV}J-rh+LDrT}DXa1T*6woc+z7i~s-t07*qoL<FuvV1nfiJv{&b

delta 137
zcmV;40CxY(0m=c8Nq=lfL_t&-m7S2m4S*mJ1a}EtSOyL7w<?R`Zv&P=9qR}6Jkby*
z*$+3H+yO~&$mDvI5J@7H`e>LU0DvT;8LTay+=83D&C}w|RO(Ss@Vk8xM#Wz;M`e3p
rZpV0XSGI!=q$H5%CT~AON!S5xIv+Am2G^zl0000<MNUMnLIPldV^%mZ

diff --git a/res/drawable-hdpi/search_bg_panel.9.png b/res/drawable-hdpi/search_bg_panel.9.png
index c868b2fc97d258b47137ce08cf92e9870de26f11..0c00d364a100a03c3df3056a21f61bcb0b57cf11 100644
GIT binary patch
delta 125
zcmV-@0D}M90kHv)7YZr}1^@s6dzFy}ks&B(Q%OWYR49?njZq4~APhra#oO)v$C=%S
z%0!AzDzf|(UXn)0QeH_c-~s}W01eeGrUJySK8LBj>&frX{CSUtc0%XSv3gD78#3#E
fhw4ktp%_peBilrTg|4s400000NkvXXu0mjfq^dS>

delta 168
zcmV;Z09XI90owtP7YaTI1^@s6<I>TKks&C5eMv+?R5*>z&ut2TAP_~-Ye@TFRf{S=
z`jOHYgGweOL~wlbrVQ7K+{f4i8?XX95SM(LE+c?MpB`+&AiJNaCWAy@Lv_4Br=dDN
zh)%w{wzrej&cEYP`=c*0FA7>x#TlLb7~i3vkgSf=?Ci(9sOStDs@n&XZ8Y+uvz;Up
W>vC*hRRt#i0000<MNUMnLSTZUM@kL=

diff --git a/res/drawable-mdpi/grid_focused.9.png b/res/drawable-mdpi/grid_focused.9.png
index c7e6b06da57ce4e765e334c0eea3ba3eebcd59c7..6660a8c18e5501c2247fe2b866e680aa921674db 100644
GIT binary patch
delta 110
zcmV-!0FnQy0k8p(NoP_?L_t&-m3@y<3V<*SLtn;jr1u*h%3I81c#imC2UW%bp|nX#
zi)|7dd>fl8iS4|5%&w>%K+;}Q`rwNOxa5^Hl$AIPS{d>UZK8|xrhmjX4>~9r>^#f4
Q0000007*qoM6N<$f(i&N{r~^~

delta 104
zcmV-u0GI!;0jdFzNnuP$L_t&-m3@!V3BVu_LlbeM?$Kd|j^rHAk5))U4CLc3k0U2Q
zAwItYsM^-`^dB`L+pe*^7pO_1<jI}NDV%^$Kz3-G+=@3@EI<Rpg&Bo-i}6|j0000<
KMNUMnLSTYQn=Io1

diff --git a/res/drawable-mdpi/grid_pressed.9.png b/res/drawable-mdpi/grid_pressed.9.png
index 09a7e3fbe3d4b45717531f5f5c98d1117e8febc5..c7e6b06da57ce4e765e334c0eea3ba3eebcd59c7 100644
GIT binary patch
delta 104
zcmV-u0GI!z0jdFzNnuP$L_t&-m3@!V3BVu_LlbeM?$Kd|j^rHAk5))U4CLc3k0U2Q
zAwItYsM^-`^dB`L+pe*^7pO_1<jI}NDV%^$Kz3-G+=@3@EI<Rpg&Bo-i}6|j0000<
KMNUMnLSTYMBP`ee

delta 99
zcmV-p0G$7-0i^+uNnA%sL_t&-m4%PN4Zt7_1J8(!7^JiI!AQ(u9?&ZAi6uX*SSJVD
z1bKS}n<|Oc$I<#ql2k}kA`*DEe^N@QfCA;c?)e6?Hz%F(7$IQF6N&%;002ovPDHLk
FV1g-?DKr28

diff --git a/res/drawable-mdpi/grid_selected.9.png b/res/drawable-mdpi/grid_selected.9.png
index a40b0582666a88da149ed6f490a203553f682a0d..e2732b770b09fe439c88dc956e22131d0b475b10 100644
GIT binary patch
delta 103
zcmZ3=xRP;#XM(q<i(`ny)Z`!k|JySQ{op?;aPI$qo*o_`I2JwM%pid=eeY7mM>j+q
zj{Y-Nl<wp;csRL5GvUbc2G+BFB?nG4JURP6W5&b(KurvL1LYnDXfPjR00K`}KbLh*
G2~7YUxGfq0

delta 99
zcmV-p0G$7+0i^+uNnA%sL_t&-m3@!F3BWK6#B?DWb@q<bIh02mNKJ^~9=3&zQCaZI
zTPQsV*ZusgDJ2QOPMAI0x^hQ54X2Qk(96wASl+Y*l>vI)ATxc6>stT-002ovPDHLk
FV1hjGDkJ~^

diff --git a/res/drawable-mdpi/search_bg_panel.9.png b/res/drawable-mdpi/search_bg_panel.9.png
index 81f01ceba7c94dc126aff518586a759eb7fd027c..0fadc7754a2569e3f11312266ac5efb2f9a8a059 100644
GIT binary patch
delta 110
zcmX@YxQKCrIF~F38v_GFuf|#3iHaJLE}kxqAre!Q6B-)+2b?*;l=|a<$_xpC2lC87
zAS}ebn}Ivzf&Qk2Cc;0QSw&NBd}8-noS~@GkjUMc_D4C6f$c#dH^aMY2L7*$rmzCd
OW$<+Mb6Mw<&;$Uwv?S&L

delta 144
zcmV;B0B`@I0mK227YZr}1^@s6lvnyVks&C1W=TXrR49?9l1mPNAPfaZ<NeR&m4H@V
zNC^U_ews9Crt{JTz*&24mOQMsnDa0J3SdB6AR|LsL+lDb8Ug(Yq6@l60Je8VY=Lk1
yAW%KS$4Gi)bXR<X8i*T7Ze$295xoUg<>MaU=1xidp?|Od0000<MNUMnLSTX`DK}04

diff --git a/res/drawable-xhdpi/grid_focused.9.png b/res/drawable-xhdpi/grid_focused.9.png
index 20d4647df110c03fbafd2b966bfa540135417701..37228b3414b24b53bb8a95d9313ef23b08e53ff7 100644
GIT binary patch
delta 130
zcmV-|0Db?#0mK22Nqc5VL_t(2k-d`93BWK2MDId2YWE8rs#~OEbdKvsOCd%`@FNEz
za>_##lHf=tT2n$MiS4|r@h($0KFK|KxEW<rAA|n#Wrc|e&hoQ^VdDBhE+yJK7PqSx
k!$e8~`L8*;DS`LNA5aq*{$||DbpQYW07*qoM6N<$f<@3c7ytkO

delta 127
zcmV-_0D%9*0l@)~NqA#PL_t(2k-d^p3V<*SL-S-e@*W;`;E_B>{16A$%48o4^rN(C
zT2k3o0*81OZ52T4ex&R$r~zQ<5I#{tzIFQRy}_{JqU89$#9_txM5Zc6A8Xq6#`x!8
hThPwzd5UyB`3b*-7?(e_hI{}3002ovPDHLkV1kE#JOBUy

diff --git a/res/drawable-xhdpi/grid_pressed.9.png b/res/drawable-xhdpi/grid_pressed.9.png
index 73a784b600adc633694aeae9f4938f378dfcdd13..20d4647df110c03fbafd2b966bfa540135417701 100644
GIT binary patch
delta 127
zcmV-_0D%9#0l@)~NqA#PL_t(2k-d^p3V<*SL-S-e@*W;`;E_B>{16A$%48o4^rN(C
zT2k3o0*81OZ52T4ex&R$r~zQ<5I#{tzIFQRy}_{JqU89$#9_txM5Zc6A8Xq6#`x!8
hThPwzd5UyB`3b*-7?(e_hI{}3002ovPDHLkV1k5&JNf_s

delta 124
zcmV-?0E7R*0loo{Np)aJL_t(2k=2sX34kyRMBhm^au8?r!;zfh{E?!uK@bsq5C}ak
z?a^SH4o-CzZ9)>`vUc5RP(zZ28$-$W#-I}(m=5Ox=A^s2(M8{QJ)?@g5xbC|lQUfg
e|L7liy5t+Sf*+02d)#gS0000<MNUMnLSTY+i8q=6

diff --git a/res/drawable-xhdpi/grid_selected.9.png b/res/drawable-xhdpi/grid_selected.9.png
index eb0f3dc2f19bf4c03e6bb7ac9e11310aff900808..c8b9b6b2cf90fae0b82f7c06b3797cbfe223e0b4 100644
GIT binary patch
delta 127
zcmV-_0D%9;0l@)~NqA#PL_t(2kz@G(|33p3@E;AMO8)=Pz{tSBz+k-fX#+OhxWHL&
z=>{fJG#~>Obd&HYMsnGIvTbByz~XsgHIi*3{WUVu)kc(fBq0Scl5Hd7|Ns9P7#ZQ-
hBowEN3=EJ&4gds$9bF4E1t9<c002ovPDHLkV1md&HIx7V

delta 133
zcmV;00DAwy0mlK5Nq%WbL_t(2k-bve4S*mJYYAI0hGRIdV>pI$ln)~Tass&+o7@Mv
zE4@b{2?o?fo0JeqVmmIA-F;L*l3_x4MXVp^o;WJ5I+I&5z!-j&=vMrnINaptip?Dt
n9Q45N97+ON#+)e<xJ{k`^kN;cGe<1a00000NkvXXu0mjfn*KEB

diff --git a/res/drawable-xhdpi/search_bg_panel.9.png b/res/drawable-xhdpi/search_bg_panel.9.png
index 3cd534f954263aa3b2a735af1bd08ef3e9fb097f..963cb7ff476d068b454f39a8533eb039c81d375c 100644
GIT binary patch
delta 146
zcmV;D0B!&O0mcE47Ya8B1^@s6FX}r$ks&C3Xh}ptR5*>@kWmW2APhrO>Fsv^<E-6>
z4%&*0qMNY(s0ptL66z@Y5I6AvP?{(J^nOqvz~-*@<RES_#2E4tkzXYvLU$79x{SQ>
zb;jhXe1`p9q+9)-a7IUzC_HAYAzZ7jE)5L20EQP_pDeUYYXATM07*qoM6N<$g4{(u
Ah5!Hn

delta 204
zcmV;-05ku_0sjGz7Yb4c1^@s6chjY*ks&C5p-DtRR7i>4luHhPAPhu@gn0i`c_`)M
zLQMvBOi9&+T^U}UouUx1Rz+JOZi^#;VOyL4)JR69XY3#<z(!$EsPW0T1Z-rJkqH!K
z6rYh?sTzX^l&Rh_Omj#hsUEf4=<o4MV<zDIf?pW&;3Ng)aqdqwD`1-AK|}uS@*;CL
z8u<gmmkJEzotSW_u3J>5YF=eZ<uv4$$W#)TdfXd9fUp3Rc$v1nfy!e50000<MNUMn
GLSTYOdszVh

diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index d5aff8af80..6b05c2705b 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -21,6 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:layout_marginTop="90dp">
         <LinearLayout
             android:layout_width="match_parent"
@@ -43,6 +44,8 @@
         android:id="@+id/workspace_cling_open_all_apps"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:layout_marginBottom="130dp"
         android:layout_gravity="bottom"
         android:gravity="center"
diff --git a/res/layout/wallpaper_chooser.xml b/res/layout/wallpaper_chooser.xml
index 60d971907e..49930769c7 100644
--- a/res/layout/wallpaper_chooser.xml
+++ b/res/layout/wallpaper_chooser.xml
@@ -32,7 +32,7 @@
         <Gallery android:id="@+id/gallery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:spacing="0dp" />
+            android:spacing="-4dp" />
             
         <Button android:id="@+id/set"
             android:layout_width="wrap_content"
diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java
index 4f37cb9e0e..09c5062aef 100644
--- a/src/com/android/launcher2/Cling.java
+++ b/src/com/android/launcher2/Cling.java
@@ -62,10 +62,6 @@ public class Cling extends FrameLayout {
 
     private Paint mErasePaint;
 
-    private View mWorkspaceDesc1;
-    private View mWorkspaceDesc2;
-    private View mAllAppsDesc;
-
     public Cling(Context context) {
         this(context, null, 0);
     }
@@ -98,10 +94,6 @@ public class Cling extends FrameLayout {
                 r.getDimensionPixelSize(R.dimen.toolbar_button_horizontal_padding);
             mButtonBarHeight = r.getDimensionPixelSize(R.dimen.button_bar_height);
 
-            mWorkspaceDesc1 = findViewById(R.id.workspace_cling_move_item);
-            mWorkspaceDesc2 = findViewById(R.id.workspace_cling_open_all_apps);
-            mAllAppsDesc = findViewById(R.id.all_apps_cling_add_item);
-
             mErasePaint = new Paint();
             mErasePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY));
             mErasePaint.setColor(0xFFFFFF);
@@ -140,11 +132,6 @@ public class Cling extends FrameLayout {
             double diff = Math.sqrt(Math.pow(event.getX() - pos[0], 2) +
                     Math.pow(event.getY() - pos[1], 2));
             if (diff < mRevealRadius) {
-                if (mDrawIdentifier.equals(WORKSPACE_PORTRAIT)) {
-                    // Do nothing
-                } else if (mDrawIdentifier.equals(ALLAPPS_PORTRAIT)) {
-                    // Do nothing
-                }
                 return false;
             }
         } else if (mDrawIdentifier.equals(FOLDER_PORTRAIT) ||
@@ -167,7 +154,7 @@ public class Cling extends FrameLayout {
             DisplayMetrics metrics = new DisplayMetrics();
             mLauncher.getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
-            // Draw the background
+            // Initialize the draw buffer (to allow punching through)
             Bitmap b = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(),
                     Bitmap.Config.ARGB_8888);
             Canvas c = new Canvas(b);
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 318601d0b1..3c2c3daeae 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -77,10 +77,10 @@ import android.view.Surface;
 import android.view.View;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Advanceable;
@@ -3130,41 +3130,56 @@ public final class Launcher extends Activity
             anim.start();
         }
     }
+    private void removeCling(int id) {
+        final View cling = findViewById(id);
+        if (cling != null) {
+            final ViewGroup parent = (ViewGroup) cling.getParent();
+            parent.post(new Runnable() {
+                @Override
+                public void run() {
+                    parent.removeView(cling);
+                }
+            });
+        }
+    }
     public void showFirstRunWorkspaceCling() {
-        if (!isClingsEnabled()) return;
-
         // Enable the clings only if they have not been dismissed before
         SharedPreferences prefs =
             getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE);
-        if (!prefs.getBoolean(Cling.WORKSPACE_CLING_DISMISSED_KEY, false)) {
+        if (isClingsEnabled() && !prefs.getBoolean(Cling.WORKSPACE_CLING_DISMISSED_KEY, false)) {
             initCling(R.id.workspace_cling, null, false, 0);
+        } else {
+            removeCling(R.id.workspace_cling);
         }
     }
     public void showFirstRunAllAppsCling(int[] position) {
-        if (!isClingsEnabled()) return;
-
         // Enable the clings only if they have not been dismissed before
         SharedPreferences prefs =
             getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE);
-        if (!prefs.getBoolean(Cling.ALLAPPS_CLING_DISMISSED_KEY, false)) {
+        if (isClingsEnabled() && !prefs.getBoolean(Cling.ALLAPPS_CLING_DISMISSED_KEY, false)) {
             initCling(R.id.all_apps_cling, position, true, 0);
+        } else {
+            removeCling(R.id.all_apps_cling);
         }
     }
     public Cling showFirstRunFoldersCling() {
-        if (!isClingsEnabled()) return null;
-
         // Enable the clings only if they have not been dismissed before
         SharedPreferences prefs =
             getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE);
         Cling cling = null;
-        if (!prefs.getBoolean(Cling.FOLDER_CLING_DISMISSED_KEY, false)) {
+        if (isClingsEnabled() && !prefs.getBoolean(Cling.FOLDER_CLING_DISMISSED_KEY, false)) {
             cling = initCling(R.id.folder_cling, null, true, 0);
+        } else {
+            removeCling(R.id.folder_cling);
         }
         return cling;
     }
     public boolean isFolderClingVisible() {
         Cling cling = (Cling) findViewById(R.id.folder_cling);
-        return cling.getVisibility() == View.VISIBLE;
+        if (cling != null) {
+            return cling.getVisibility() == View.VISIBLE;
+        }
+        return false;
     }
     public void dismissWorkspaceCling(View v) {
         Cling cling = (Cling) findViewById(R.id.workspace_cling);