From 6b3f51d373f19711a7fac44f2f6df9dc89110eb1 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Thu, 16 Jul 2009 17:45:04 -0700
Subject: [PATCH] More new gestures UI. Adds a back button at the bottom of the
 settings activity.

---
 res/drawable/g_background.9.png               | Bin 0 -> 392 bytes
 res/drawable/g_bar_background.xml             |  19 ++++++++
 res/drawable/gestures_frame.9.png             | Bin 6582 -> 3882 bytes
 res/drawable/mirrored_shadow.9.png            | Bin 0 -> 165 bytes
 res/layout/gestures_settings.xml              |  44 ++++++++++++++----
 .../android/launcher/GesturesActivity.java    |  30 ++++--------
 .../android/launcher/GesturesConstants.java   |   2 +
 src/com/android/launcher/Launcher.java        |   4 +-
 8 files changed, 66 insertions(+), 33 deletions(-)
 create mode 100644 res/drawable/g_background.9.png
 create mode 100644 res/drawable/g_bar_background.xml
 create mode 100644 res/drawable/mirrored_shadow.9.png

diff --git a/res/drawable/g_background.9.png b/res/drawable/g_background.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4bf817644d2fd12aad1025498fb25231e9451d7
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0y~yU~~eq?Ks$gWSo`IBp@YO;u=vBoS#-wo>-L1;Fyx1
zl&avFo0y&&l$w}QS$Hzl2B=HR)5S5Q;?|q%*<4Ky5^aI|GsJiP&)sL4pz=4sc=v?o
z0*W5SmnZaxdG1=as_k$Hdx3#zn}PlALy5INKh(UxG2u3E`frA}Q{TUNzPZ}y-;zz=
zf9#Y`Isbll*<SD0b7H(A4e$Snc>U~F-M`k4)343%eg5p+`LmWgw{3c6%ztwCm)i0y
z|E72B2PV$_Bg@7o?-b3zq1Yh6G)Ra)-Nn_bwX7Lsf+p?aGGMSgpH!vlwMiKmv<#lE
KelF{r5}E)A(|_Cm

literal 0
HcmV?d00001

diff --git a/res/drawable/g_bar_background.xml b/res/drawable/g_bar_background.xml
new file mode 100644
index 0000000000..b9f6694943
--- /dev/null
+++ b/res/drawable/g_bar_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/g_background"
+    android:dither="true" />
diff --git a/res/drawable/gestures_frame.9.png b/res/drawable/gestures_frame.9.png
index c5f5640632afa1f008a312095eef507b70aab69f..3119a815bc07d53293235c162b40075a0fd4dee1 100644
GIT binary patch
literal 3882
zcmcJSX*3(^*2kmADQZfKa#U+L$J821TVg(Ow5nCAs#R2q;-H35VoVezt?{%qRT@=A
zH6&H@kkBUN)Ob)e#88PTC5Ryjk>tAf%f0V?*Ilb?-S_?Q{P$XWJ!`N1eE9wMejZ(Q
zu$4TdcnAOhNZMVrxds3T+3X)B(S!S$cH=&e{qWQM^RD-uL;dc<yuy6};JcyTzAARX
zUjDw<e7)|*KtK7K0{~LJb~fPa(Gx3EJt4<#!8>LnE`HOaScLTYB}y2I`sD(~{fcb=
z44V7V@YfS}H?H2&Shi1GnV4eK=(@{4(Oi_(Kk3xz%~W%G){ZM`$%&Lv=W+C}S;#nF
znl&LQY+|oT0Q9e~HAnrD+Hv_tYQu+>rvlDqvEUqp=|f-{H+zKk4-5$COG``2M;C2f
z%-)2CEp2nT<2!l&C+LOjMkcgsEHn_W%3u|^WvK@@3nITby2pnOwNM;S<=twskoF_C
zwzdj(cDI)i*<>1K@b|3%kP?446tO$po=*{}hoE6QebOe;R&6m{7NnaSZkiAuujJt1
z(0!mJUw=NoDqbf;#EJBYz1-o=xt7#4piq7s{vx2yXGyUx@?*YH1~Zl!G#w%Z+2-%=
zn$9UmZM<ZY(|dZ-aS$v&!j#r`Q}OecICl+VdU`qn>s^53%ucoDSmDYu;LTgHstcDL
zWydu<%_Q7nlNc4p?*$FNER$pxp`*Q56zl3f@tr3I4W)6~KiqE4=ux+2ZfsoPY|KY+
z_I4r^wz%zPW>#FTxi<f1p`!AS298JMn^A}*>4OM&qidb(8-@}GlXGzT$KF`3UMW@Z
zmqDHor8>kG7)?Sac+e1;Hu|o<I+BtWj;F6zCN~A*cPqo2P0FBhM5ks6+gS#s(WTK6
zv3tFR1&jHM+rC!|8$GLvMxoGrpYiUU@mpBBuiVGd_-+q}B8=98N}e6mQuTt#b>jWg
zGSm_gC_TB$;iGX(El#D}g**hcM&Vq<z2%65S`u-@(@I?@9~&DR&l*7-90&N(k=ygM
zQk8|jcpAk=1PzmP--m&Qy{hIG7S-tAs$RKjkdBZhQjjWy1~KS-P1Wvm$W<WhoT{GW
zz!?$fQ!%LFaVg?$TwTym6|5O*mB6`b%5I&kt+fUBe&GHVgLqy+JkkzEi#nF;zj>zB
zUrstg3@=3ci6^NXqCN-P9}8*JMY<PX!W94;#k}3>1-cG}`NwZYLPnAcM4A=iMy%&e
zI%_vK!%%Tiad9_aaR>p{Rao;rp%uqseH|flG}<u#bU*qxSsTwwK(n=kOqw}Kg)k>p
za~Wv-0_dK7D)(lAZApGU2EE`8dT7~y<rKIVAIH{0&Y#bvzjpmGl%>`^xN<&s56*w}
zcv1Q=NmGn^L1y(JI6gpz>MU%K>AYR#iNc!o7qcr62F|88`V(;*j7%AC-Hc7`cd>-9
zmT;aLQk1&sh@36tpP`JZv8Zz~B=f_pZ?}u!9tYdbXX6UH^z>}rov;QAd-8oETh?6g
z5Z&LVN(Fh%eD*`=?3zR;5L6%rov7rp*;mq4?~7CSva9{Y(^b|@kC=o`7~<tH2im%r
z%n#$+-6{v-Lxm6j3KaT(5&&2jX!Cz9iEF)gigKMVsdg=S3bVXxtjg@-#HjbkrGr|N
zlar|!jJ_90>7gf1ewPPd+K$T<Y1<I5!cXz1-4G?5*W5sNbIajTif>J1mioiG<hZDv
z8*U9b))$YR@Tc$uU-M5I@z-$^E}PKKPb~rC_`wEG3Ve7aDE-CiNWoED_S56!)cGRT
zcr>b##e!R<kDkLJ+GjwJ61WaDT*<)P6<b$U9Cs$jzP=U8hnY{$q(mnq9Jk!ti{SJ?
z_{Q<PUEQ>I%2`=i;j$4xX9-$c@14IOZ+15zIb$r0>`h)dDV0~XJ93Y6Z(Pb}^foy)
z*kbQBUEVN?ZhP;RepFmoOjv@)`=<^13G`rH_R4#aE`=}L>8cuhzm-=u!HGT?Y;bl`
ziGtAb?h&fyv%30W@Ou(#PZ*tf_yrY9zA3GnT&p0Dk$2C_zRao(#HSf=#~Q%qwHnK}
z{GQYp=3JR5G(yWZ9`e>^;@aU7R=h3M_&tvH<m7Y;jYf+<O$&P_ZPaClPlFMGZU_Ly
z=O_0sLF1n<fIV(BHw6GG4WrExHQV6XnB*~D!<hE<V>Y-b_Z3A_)3?^?qhn)3e>80=
zpskQK!*J>ox?a^tPH_Jj>X7o+F#}|oE|0z*86NHtS&phq^^z!^4MWIKe?L3Ev$JCd
zvapbnmzSTVZWyA_sJSF*qu4A1>>2dE_2ZAscFSRwRh(Zm|C~acrb#t?3HW&m{+zao
zj#(n)I%I2M*vgG2c}>Y{e&o;v4ae)%ZULGzMGD3Oiwx;vGo7bi0rsJ>6O#k}ujaMe
zHkh6or1!&25TsmWaE%;>N>6}C9qr%n-Bbx-9^++D4_XQ9?}FHzbLKl1vNSKHMbD(B
zVp_I)@WSk7S}iz`61sVZg2S0Y^aUCIjxWorA#|a!v=4elPlk9w)^4IoClLjbDo8+*
z==X`fCbB&e21xt8ND#5RVk@JT=<N4jG6lM82NbgZ*B0D`4Z4=50m6s>M`c$t<fkbi
zQMG^c+JULTEONiYDcn|;5UUsd-Bcc|b%*f(clzJ02W^Nn=$Z=w{0X+#J`elhKfE=u
zS~9BU4~0#2(heD*K{_qwbN&3+xEH`>LPDz)o}V8EgYDxFUfPbWuY{V~I?VKH_Utn1
z1I~O7!Pzzt`uA8OltPA@B?n}b@vg>b!P3p&YiGi1TG=OIsxw=jy!0iwHzZx$EROSu
zI+7jo=yG0`_;PB~w?C@A9w{iU=9QfyyO>4CBTp%ZG{)CSiL-Y%A9>kwE!Mq$US(ml
zZ(r2Lqg1+10(Oc$QG)W<XQha<S{dZZqa@JnD8)<>aC*IOo^a^VXLP<F*lwp-WOgNb
zdb+{GXY#o<{+E}G!Sqb!nfCPR2N@V@<3@|#;NyXPg1SP7qBNDEX<nu&JVJ<iN^K8s
z(F^lyh#cv|ot%mec(j0)J=;ey9*HE|l4m({zbMU9_Q&)?+qt|yb@p0}FVH^t><wuL
zMY`TN_<N^Oet&SV>Md?VB<=91xc%guQ>?0eW$eY+9icZ_wR;VujkOJ*Q|T#n$qBm6
zRzs=o5E%Y!%+oKfgyEs(dyPE?u&L>f4b=OfZ}a?T>{9c@%r0NiV~kL1o#B}^guwX3
zTf$lzJtyjYp=85*hqeWBp`RcGu7e>gG*FE3)r_XR>c;-<o{!Ilczwa_I9j;m=sAX9
za8Z&x^sd_TCv14~rL@P)Xr&9KgK!NSeH4Iu{eY|WEj18k9+b&8Rz0x77FO4_&!aHY
z#=o1T?`7_v_e9kaRStZ=bcjoPhtB|TE|-oc7s%Uh%XKdfi+2d!e0MH26Kr3vRenop
zv0B#l>($hbx^+GwpfW09>Lt`#C!Yz*kk`X|I!XjsmW~ZdueC^XUa$#WP^@{L3nj2M
zVVE+J6*L~Z>|s@yqKI|e9uM5%O*eTEBd>4~TQS5MopJtK+NFB*xr8=Dq;E-#ux;t5
zvZI}9U9Pu(1;UPzq%`A`_B}Sh<CXEFnWpJ_I=OZ&;+{BlD$G^ayjN9eA-iXh*V-Cr
zTGd~($sH%ZLaLltNEtI}Ni$bnkS5cd<T{*I$Fz)tqqH+y3C)#8MOKd4Nuch_61zM;
zgArVBEk{)P7~g50SUc<oo+}fEzGzR2?gM))2f-i6P`iB~XOJTaE*AbEy<p7q8?iU^
zhyhA#;gki8?m>gxiEZvIWfbSN#R^tfkP8jxc<ZK?y~nrNi+Q7Doq)nlz+ze*CsC86
zS3|jP?a?yz&E%sS5F-?7IG5Xys{n5$pe2$^2RY0XkfLOER+hsh4i=03I6prhf1t{t
zWb>d%GC0If%DZ`b6S;C4=|z-Z9&%RlPxCQ(rV=F$;ifd*0>P9?EXL<AZW7)m%Y9%a
zskOHiLRN^KYr1C=ESby{S0kqzCuP1?3=|VT(F5w~<1#sAZ`F}_`e#rPQ2mclBUQp@
zmDRb=(L^!k{tiypj>s3QF>S3bCvEJ_zKdO5e=A%gkz|s!U5t+bZr0uWv8K56re_|1
zJ|FUt%U;uz(*^gI=;&jgDfDaF=-#mf$7hK_{V9_g1p`W?NKI0RkUL?;Sp@om_M8{c
zw<otS*mQ^rv4W#)-=TI=%NKzWK+NV6SZd~tP63U*nI=6_xw$_$U%xj=8WBHPt6=Ku
zXN$;xZsZwY_4lQoS*bw^&YyAtIy3rK27<9T9Hw^0aNULRJR?UvtFNMW-sD4gcl`bP
z*Q-5@Hbxzb-}acJj)a|l+b+*w&=Ku4xji94!&C3rS6ofTtmT@i6V@z7&uV^Zb@FH3
zX2<UFU=-o#wQ}OO4C53iEyWf7pgW0df~=^hDA^P1XKcCrB(;?vYaXS!vMf}|8w_Mq
zBD=o4MNOSJuABykLmWzbPW2H#&D_pjfRzYjrSEK*cHdz=X#IhM9Vox{SfJklFh65o
V554;`cmMMXusiQygSEbs^f%0jG`#=-

literal 6582
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

diff --git a/res/drawable/mirrored_shadow.9.png b/res/drawable/mirrored_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..84516dddb0d1c0cc7e6cf89c1835eaab24ba92a3
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^VnEEn!3HG%X7FDCQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JirhV2978H@CH?vT-=2A6!^DY#EB@Fk2WEL1&Ja1kRLaRd
z_3YnsOsO1~jvRGRaMW&I`93MYhxz5xD<&dSiVmz~%CZRMW#celSQ{<&X{PiBU7(Q+
Mp00i_>zopr0NjT*-v9sr

literal 0
HcmV?d00001

diff --git a/res/layout/gestures_settings.xml b/res/layout/gestures_settings.xml
index d32b3ec840..712cb22d2d 100644
--- a/res/layout/gestures_settings.xml
+++ b/res/layout/gestures_settings.xml
@@ -14,22 +14,46 @@
      limitations under the License.
 -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
     <ListView
         android:id="@android:id/list"
+
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        android:layout_height="0dip"
+        android:layout_alignParentTop="true"
+        android:layout_above="@+id/bottom_bar" />
 
-    <TextView
-        android:id="@android:id/empty"
+    <View
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_height="6dip"
+        android:layout_alignParentTop="false"
+        android:layout_above="@+id/bottom_bar"
 
-        android:gravity="center_horizontal"
+        android:background="@drawable/mirrored_shadow" />
 
-        android:text="@string/gestures_loading"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+    <RelativeLayout
+        android:id="@id/bottom_bar"
 
-</merge>
+        android:layout_width="fill_parent"
+        android:layout_height="60dip"
+        android:layout_alignParentBottom="true"
+
+        android:background="@drawable/g_bar_background">
+
+        <ImageButton
+            android:onClick="back"
+
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="13dip"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+
+            android:background="@drawable/btn_g" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/src/com/android/launcher/GesturesActivity.java b/src/com/android/launcher/GesturesActivity.java
index 24775ffe31..0b66ae1ea6 100644
--- a/src/com/android/launcher/GesturesActivity.java
+++ b/src/com/android/launcher/GesturesActivity.java
@@ -56,9 +56,6 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
 
     private static final int DIALOG_RENAME_GESTURE = 1;
 
-    static final String PREFERENCES_NAME = "gestures";
-    static final String PREFERENCES_HOME_KEY = "gestures.home";
-    
     // Type: long (id)
     private static final String GESTURES_INFO_ID = "gestures.info_id";
 
@@ -68,7 +65,6 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
     private GesturesAdapter mAdapter;
     private GestureLibrary mStore;
     private GesturesLoadTask mTask;
-    private TextView mEmpty;
 
     private Dialog mRenameDialog;
     private EditText mInput;
@@ -86,12 +82,16 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
         getListView().setOnItemClickListener(this);
 
         mStore = Launcher.getGestureLibrary();
-        mEmpty = (TextView) findViewById(android.R.id.empty);
         mTask = (GesturesLoadTask) new GesturesLoadTask().execute();
 
         registerForContextMenu(getListView());
 
-        mPreferences = getSharedPreferences(PREFERENCES_NAME, MODE_PRIVATE);
+        mPreferences = getSharedPreferences(GesturesConstants.PREFERENCES_NAME, MODE_PRIVATE);
+    }
+
+    @SuppressWarnings({ "UnusedDeclaration" })
+    public void back(View v) {
+        finish();
     }
 
     @Override
@@ -106,12 +106,6 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
         cleanupRenameDialog();
     }
 
-    private void checkForEmpty() {
-        if (mAdapter.getCount() == 0) {
-            mEmpty.setText(R.string.gestures_empty);
-        }
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -257,7 +251,6 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
         adapter.setNotifyOnChange(false);
         adapter.remove(info);
         adapter.sort(mSorter);
-        checkForEmpty();
         adapter.notifyDataSetChanged();
 
         LauncherModel.deleteGestureFromDatabase(this, info);
@@ -269,7 +262,8 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
         if (position == 1) {
             final CheckBox checkBox = (CheckBox) view.findViewById(R.id.checkbox);
             checkBox.toggle();
-            mPreferences.edit().putBoolean(PREFERENCES_HOME_KEY, checkBox.isChecked()).commit();
+            mPreferences.edit().putBoolean(GesturesConstants.PREFERENCES_HOME_KEY,
+                    checkBox.isChecked()).commit();
         }
     }
 
@@ -328,12 +322,6 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
             adapter.sort(mSorter);
             adapter.notifyDataSetChanged();
         }
-
-        @Override
-        protected void onPostExecute(Boolean aBoolean) {
-            super.onPostExecute(aBoolean);
-            checkForEmpty();
-        }
     }
 
     private class GesturesAdapter extends ArrayAdapter<ApplicationInfo> {
@@ -471,7 +459,7 @@ public class GesturesActivity extends ListActivity implements AdapterView.OnItem
             ((TextView) convertView.findViewById(R.id.title)).setText(title);
             ((TextView) convertView.findViewById(R.id.summary)).setText(summary);
             ((CheckBox) convertView.findViewById(R.id.checkbox)).setChecked(
-                    mPreferences.getBoolean(PREFERENCES_HOME_KEY, false));
+                    mPreferences.getBoolean(GesturesConstants.PREFERENCES_HOME_KEY, false));
 
             return convertView;
         }
diff --git a/src/com/android/launcher/GesturesConstants.java b/src/com/android/launcher/GesturesConstants.java
index 3151ea386e..93a1f10ba8 100644
--- a/src/com/android/launcher/GesturesConstants.java
+++ b/src/com/android/launcher/GesturesConstants.java
@@ -22,4 +22,6 @@ interface GesturesConstants {
     final long MATCH_DELAY = 370;
     final float LENGTH_THRESHOLD = 120.0f;
     int PATH_SAMPLE_COUNT = 10;
+    String PREFERENCES_NAME = "gestures";
+    String PREFERENCES_HOME_KEY = "gestures.home";
 }
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 21b69491a2..be013eb45e 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -984,9 +984,9 @@ public final class Launcher extends Activity implements View.OnClickListener, On
 
                 // TODO: This really should not be done here every time
                 final SharedPreferences preferences =
-                        getSharedPreferences(GesturesActivity.PREFERENCES_NAME, MODE_PRIVATE);
+                        getSharedPreferences(GesturesConstants.PREFERENCES_NAME, MODE_PRIVATE);
                 final boolean homeKey = preferences.getBoolean(
-                        GesturesActivity.PREFERENCES_HOME_KEY, false);
+                        GesturesConstants.PREFERENCES_HOME_KEY, false);
 
                 if (!homeKey) {
                     if (!mWorkspace.isDefaultScreenShowing()) {