From 94dabf1be48001ea2a8fcb496fe08ba82b229e00 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Tue, 21 Jul 2009 10:55:43 -0700
Subject: [PATCH] Remove gestures from Home.

---
 AndroidManifest.xml                           |   5 -
 res/drawable/btn_add.xml                      |  26 -
 res/drawable/btn_g.xml                        |  26 -
 res/drawable/btn_list.xml                     |  26 -
 res/drawable/g_background.9.png               | Bin 392 -> 0 bytes
 res/drawable/g_bar_background.xml             |  19 -
 res/drawable/g_normal.png                     | Bin 1408 -> 0 bytes
 res/drawable/g_pressed.png                    | Bin 1784 -> 0 bytes
 res/drawable/g_selected.png                   | Bin 1794 -> 0 bytes
 res/drawable/gestures_background.xml          |  19 -
 res/drawable/gestures_frame.9.png             | Bin 3882 -> 0 bytes
 res/drawable/list_normal.png                  | Bin 1183 -> 0 bytes
 res/drawable/list_pressed.png                 | Bin 1563 -> 0 bytes
 res/drawable/list_selected.png                | Bin 1603 -> 0 bytes
 res/drawable/mirrored_shadow.9.png            | Bin 165 -> 0 bytes
 res/drawable/plus_normal.png                  | Bin 1218 -> 0 bytes
 res/drawable/plus_pressed.png                 | Bin 1564 -> 0 bytes
 res/drawable/plus_selected.png                | Bin 1599 -> 0 bytes
 res/layout/gestures.xml                       | 102 ----
 res/layout/gestures_settings.xml              |  59 ---
 res/layout/gestures_settings_item.xml         |  31 --
 res/values-cs/strings.xml                     |  18 -
 res/values-da/strings.xml                     |  36 --
 res/values-de/strings.xml                     |  18 -
 res/values-el/strings.xml                     |  36 --
 res/values-es-rUS/strings.xml                 |  36 --
 res/values-es/strings.xml                     |  18 -
 res/values-fr/strings.xml                     |  18 -
 res/values-it/strings.xml                     |  18 -
 res/values-ja/strings.xml                     |  36 --
 res/values-ko/strings.xml                     |  36 --
 res/values-nb/strings.xml                     |  36 --
 res/values-nl/strings.xml                     |  18 -
 res/values-pl/strings.xml                     |  18 -
 res/values-pt-rPT/strings.xml                 |  36 --
 res/values-pt/strings.xml                     |  36 --
 res/values-ru/strings.xml                     |  36 --
 res/values-sv/strings.xml                     |  36 --
 res/values-tr/strings.xml                     |  36 --
 res/values-zh-rCN/strings.xml                 |  36 --
 res/values-zh-rTW/strings.xml                 |  18 -
 res/values/strings.xml                        |  40 --
 .../android/launcher/GesturesActivity.java    | 475 ------------------
 .../android/launcher/GesturesConstants.java   |  27 -
 src/com/android/launcher/GesturesPanel.java   |  69 ---
 src/com/android/launcher/Launcher.java        | 434 +---------------
 46 files changed, 4 insertions(+), 1930 deletions(-)
 delete mode 100644 res/drawable/btn_add.xml
 delete mode 100644 res/drawable/btn_g.xml
 delete mode 100644 res/drawable/btn_list.xml
 delete mode 100644 res/drawable/g_background.9.png
 delete mode 100644 res/drawable/g_bar_background.xml
 delete mode 100644 res/drawable/g_normal.png
 delete mode 100644 res/drawable/g_pressed.png
 delete mode 100644 res/drawable/g_selected.png
 delete mode 100644 res/drawable/gestures_background.xml
 delete mode 100644 res/drawable/gestures_frame.9.png
 delete mode 100644 res/drawable/list_normal.png
 delete mode 100644 res/drawable/list_pressed.png
 delete mode 100644 res/drawable/list_selected.png
 delete mode 100644 res/drawable/mirrored_shadow.9.png
 delete mode 100644 res/drawable/plus_normal.png
 delete mode 100644 res/drawable/plus_pressed.png
 delete mode 100644 res/drawable/plus_selected.png
 delete mode 100644 res/layout/gestures.xml
 delete mode 100644 res/layout/gestures_settings.xml
 delete mode 100644 res/layout/gestures_settings_item.xml
 delete mode 100644 src/com/android/launcher/GesturesActivity.java
 delete mode 100644 src/com/android/launcher/GesturesConstants.java
 delete mode 100644 src/com/android/launcher/GesturesPanel.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7bdc9cfa80..4e60e665c5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,11 +92,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="GesturesActivity"
-            android:label="@string/gestures_activity"
-            android:theme="@android:style/Theme.Light.NoTitleBar" />        
-        
         <!-- Enable system-default search mode for any activity in Home -->
         <meta-data
             android:name="android.app.default_searchable"
diff --git a/res/drawable/btn_add.xml b/res/drawable/btn_add.xml
deleted file mode 100644
index 1345fd18aa..0000000000
--- a/res/drawable/btn_add.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/plus_normal" />
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/plus_pressed" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/plus_selected" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/plus_normal" />
-</selector>
diff --git a/res/drawable/btn_g.xml b/res/drawable/btn_g.xml
deleted file mode 100644
index d033b438f3..0000000000
--- a/res/drawable/btn_g.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/g_normal" />
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/g_pressed" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/g_selected" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/g_normal" />
-</selector>
diff --git a/res/drawable/btn_list.xml b/res/drawable/btn_list.xml
deleted file mode 100644
index 84a033ef8c..0000000000
--- a/res/drawable/btn_list.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/list_normal" />
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/list_pressed" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/list_selected" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/list_normal" />
-</selector>
diff --git a/res/drawable/g_background.9.png b/res/drawable/g_background.9.png
deleted file mode 100644
index a4bf817644d2fd12aad1025498fb25231e9451d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/res/drawable/g_bar_background.xml b/res/drawable/g_bar_background.xml
deleted file mode 100644
index b9f6694943..0000000000
--- a/res/drawable/g_bar_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/g_normal.png b/res/drawable/g_normal.png
deleted file mode 100644
index 2ae97036b026a267fd0e77de7186960d3c1c9ad1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1408
zcmV-`1%LX9P)<h;3K|Lk000e1NJLTq001Tc001xu1^@s6eX<BB00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%5=lfsRCwC#
zm|06}R}{zh$w?g2CfvpeXW~FX6eAV2)~BmaLa(SG;)~Dy3i|F>s6P7S03x;`zBoNp
z5n8BJ1%*~Lj&-Og*Wq4Gy8fHJ!_LV$C-F8Z_rVQ+&X}`)S!?aJ2Q3^9v(K?<uVAlW
z{|A_+Y3e-(DV_8MDU*~Y?j^fDk=~PTNspwEe88CuU{2B-Qh-!R@(Q?AwZBQbq~A%`
z0yYK=Uh$FMlFFy2r{C4o)cEuB^YfA&ZrFRGwz#<XYiDQYPju@~(jw^!o-=|Wbl;J_
z+1%Xxp|rHLSaogEb4WyKe}6w%U0wYno&HAp1>uD~nLC;Y+t*W5Q}0SjN{U0F5PN=p
z=E8ZhCBF+>unF6OL6bS9f_+(4RprNzq?c0FYo*6<giY8M3}-OwRC=Nty)id8HxFPh
zfx5f9V>>%LEEo*(>&(ndR##WYva_=jf`d&_3EYAuq=LC53|yQD7=R`xC)w)iYRt2V
zi3!%z)5DsZo0;3~wgq!IBGt$xOOqN(9Vape;(@_C!^6Yu^77L19YC+Gt+BzuL0d4T
z>1H{`Z^-<L=dIDv(FjylRu*e&YGRd@mHhhf@Q^JnE%E301M-hr!6~*hBUq&B<0BHx
z3JykL9Idgjk#%=>^SqL+yu6%;d2Viw$v<laC1o64j9{7!r5)Jv@-jdAd_LCE(ZO6U
z7Yb(7JG;BP{8&*@5f@D4m}Up&koCn34A=Mf_w4HGieJ~)*R!;=G*iRynEZ`|Hs+KB
z6LxGprmF?jtOLjpqWS%POK%(>AM;~bS()iOYL65)^n^Sny=H8x5jip#+xGT$<Xl#H
zyTnh#V-9J|D#s8y*$`41Q)Av)SXhV(za1FBbzM&^ly+cLrCCNs277pT;Dr?>0@t$5
z%*?Qplat7GPEJnT<X38#HJCckTJ_4>+FG{0zRpfhPua-G2){<#*w|p#*Vo*OG;84Z
z($mvz!H{DDPB+e0Ey1kR($d26^78l(0J5^O!i96RwzjsY97{w=0Yjek_4P5DNJjk_
zA?@nwVjhntD#tzrEGCp{)wi4a0It2gowc^Mva_=@evjr>{CIG15S3%bAxW)gik+9`
zSiCV4RllgHC=xaqUiG=zSg9tyS&lj5h0?BBK}(OJ2itu^PIr<HW(IkCd&{=Aw)i<b
znaDR10dty_3!`UlZf^L|>-EOmpPikJDl1lDR6{SWopF=ju8y6bpR=*CvB<T|ugAwn
z{!F$&Ai#U4**D}p!wlAbtW>>Z)f-VX0b(4~WkCg0LqkKtYle7ZCH$(ZJ;m(92w#7H
zKfAcNU`IzsQO^ns3%NdJr6fESG6VaFX%tOYZm6nz?cm^*mqOS<!6s}AhA6PGc<>KR
zSuP6-3cPA^rfMaQ+``NPHep*Zgw@?1%w;h6eNSo~A0K~9lfXCe=KlZHTL9bJ+q>@V
z?Zv(Y=1M<f!Atf&NHC{Z1(%UJNHs%4LjmgUzT)CyPl`5GLi6+U!GVDR?DYJB858L*
zR2{PSB*7eFy9v8JnE8E6sv><QmhP!)Sh{1nyN3N0vD<S`Od$!TiF|Vl7_9BHNFK3t
zPxi)LSR^`<9>woM$+0J53LE#wutd)gTT*TT<xCM6W{(eISMj|#|7f;9CgF6kz3CEA
zy1GJ6B3MX(d=Pq;b<7M*U8XyPk_}~qlM2V|!M<*%zk<DjeMaqH0R{k%wc;QUrawpk
O0000<MNUMnLSTYB*{fv$

diff --git a/res/drawable/g_pressed.png b/res/drawable/g_pressed.png
deleted file mode 100644
index 13667dcbb3163c01de2f98bbeeb3df69c4fa0c59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1784
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
a1sDJdOA8-8NIuvA0000<MNUMnLSTYS&Q0zB

diff --git a/res/drawable/g_selected.png b/res/drawable/g_selected.png
deleted file mode 100644
index faed865ab6fa76e3a13814770491f7b9b713280f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/res/drawable/gestures_background.xml b/res/drawable/gestures_background.xml
deleted file mode 100644
index 59c11dc606..0000000000
--- a/res/drawable/gestures_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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/gestures_frame"
-    android:dither="true" />
diff --git a/res/drawable/gestures_frame.9.png b/res/drawable/gestures_frame.9.png
deleted file mode 100644
index 3119a815bc07d53293235c162b40075a0fd4dee1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3882
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
V554;`cmMMXusiQygSEbs^f%0jG`#=-

diff --git a/res/drawable/list_normal.png b/res/drawable/list_normal.png
deleted file mode 100644
index ee05949c76d24cab88c36d97b970812796d55390..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1183
zcmV;Q1YrA#P)<h;3K|Lk000e1NJLTq001Tc001xu1^@s6eX<BB00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$F-b&0RCwC#
zn9oaFK@i8^%Zo{q)R@|$D8vv;DFlN;PNg?{uEm@GLNDS)5dQ!Xyoi^2^dw$H+Frag
zx6(@sg=)k~Dk=(1e~HB=G0973!c5q#`(6@#5f54TV)Ei<KAD-F-5tGLE^D`O=xwkz
z*iC@xx-LF*fxMsq$OrP!Gp9!pbPoCp%7aY)pu!}9xj`Y&2<Q<gNN}wh8PHeIXV59Z
zUIIg}bc04g4>vY8#^UjKw6CwP*XeMhy&{ZcGWl_QeEbbON`sQ1-{?6R3`6%6l-SzZ
zdKrmC!lG*(&moG^!NI}N(9qB;c=-wR9>a_FICpdk+vD~1^|670fv{<sTB%g32wyub
z{$8|&HqkaQ=$um`*xgtx7R5>IrB<z4_89&}n`oODzN1;UuoC^a8hd(rdJ(LZP%<3a
zq)Ol?7E=W4U>J1qO@g^x)oRqirAZ8>fiE}*RA5t6Q(88gy%L1a=hGG!7nNYbFjP5K
zdBFLl@>W+@mzGE*t^`&n6skX1h7)Y*GFY|h<75Vt;dnJoPEIxjwY0QUUEwkmOWs{%
zFr7nb1(wU@v`i+W)vIx0nD+Mev~W0V2}U`l+kv^bzNo;USXYH(dV1P2=P;)h78Yve
zS%HxqTaOuHL6tos7F`^nP)LJq%QA%ge>{(Wkh~(vhS8A6*lV&O@t4c1OdiL_$I5wf
z;y2<k7kk7m`PsnX;bB9`FV7Rf@H4|O8VjWr7(T~k&mozanbGq3yb{Li^=k9;^ELCV
za!jaU)?ngBs{-Rt;|K<W8XSvkJtfXlfnkmj-1WfFTm0Gb^0I9R)9G}@s5sARBX`te
zSfA?ch4>xvyeol;RbM{(i07zga!j5l7GJ?ma~@OGF*Xng1hm1y!MZsn&yy3s=}^k9
zmqW6$vSJ&`-Q8W~ylQQt<Ic6g@I7up{CsC;=hB|3ILcJQtpbyB%@)k9N`5iNP;+y0
zH5<9z@OV5Gsd7wu@2;EtR;v=f0FxSpXR~I9{6nP^to>doPL{z|S68ofl-}Onwga}@
zlF+Y)xKd;=t1ouqrbHey#Xd##^b7iTa&mGeO=$V`4Q--rVyN+0nLhZFN~M1F_xA_I
z<ZRVV9CHg#7HAV~6GK_-_FzW`?{?2Y&(_w~Mx)Va$m;Cx<h5;ofB$r1VgmaX??7+y
z!VC5;7|cz#U@YS=KyfGuBg4bP-Eda#Y*ACi+}zwenw_1+PR|$6YtT2)8Q3c_n2Xv?
z*zJjco`7PYdvtYg)i?sBKp(KbLfxJ$FqsUdQ@;5L<^kwFsFSYlPB-q#l<1iBKR`c)
z94i7-S?-VF75xsir2GWsZV?!s8gtZDJg3(MRey}(3~Fz75R@U_kR1dw3FLxQ;yR`R
x6R+tmlG9K!9IJe(2itC^x53(Aw`lwqU;uoq%N!QfsM!Dj002ovPDHLkV1j%<ImiG2

diff --git a/res/drawable/list_pressed.png b/res/drawable/list_pressed.png
deleted file mode 100644
index 8e3c68c8608e2b12b2691b539996ff4a0e48be25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1563
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
N002ovPDHLkV1gTZ_B{Xq

diff --git a/res/drawable/list_selected.png b/res/drawable/list_selected.png
deleted file mode 100644
index 93858f4353aa4b2e5349c58f8ee1decee35176a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1603
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
B`LqB4

diff --git a/res/drawable/mirrored_shadow.9.png b/res/drawable/mirrored_shadow.9.png
deleted file mode 100644
index 84516dddb0d1c0cc7e6cf89c1835eaab24ba92a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/res/drawable/plus_normal.png b/res/drawable/plus_normal.png
deleted file mode 100644
index ddc588807f8b4aab61d9c16a0ee6302e3082586c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1218
zcmV;z1U>tSP)<h;3K|Lk000e1NJLTq001Tc001xu1^@s6eX<BB00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$R7pfZRCwC#
zn9omBK@i9H^|gvseiZ}ZM<GQBKSBe<laUjKqZkqn9Jz4tU*N)x3*0?$fFlP8Q7>HN
zW=x0%6A1wmA*6&LiUI|Sg}yrToN2b(2i?||aOfuAuzh`f^I>*&_RSdacwF4ZVHCg$
zU^f9~7>0b!1-c8m54s1sL)UUWE<vZDFz64+;xB9_1<Va919gF#K_vv2udxsM3i=E>
zB-j)%^okGE3wpG$u+Se21_RaA)m6D(ZnSp^V`*vW<G{ec8@Tihv;_Kvo>Rea>7Iff
zudc4XY-nik%dX9N4AClWZ*PY>Iyzp#^b_bkE-%{S*fD6?TIT2H`|IoL{g!2kSS)4>
z=eZU?7j2<Uv`q{K$CM2ApuN34fIng{<!jfn$M7%OMBBvh9nHF>o#@5gSXo(Fg<$!F
zQsK}hWdbj;STdN0VbH}l3FdMovXO^Vlf0BBPB;cK0b5^R7gJMH_IzYyM6|ZHW&|b;
z(<#R63mjiMP<+qI%8Kae=}F9+o13pP><A~>GE}fc)<<tKn6Af)i;IQV>;1PD9#6vK
zI#4Y2bWy<!Udl|o2D#Ffea_Ha*IOuxG2=Qg7v~ozu&Y2-Fy7VaVv51&xz~EkloP7%
z2G9k&YDba{Q_ExQHLa6)e_zzr)+XjUU~=H=c+ADekh+u`8yjL~W+vs~kQ{AYTwDlF
zH<Oc-HlR9&hlfQ=OG^?M-fx<w-cmY&EiW&N?(S|;T3YJpNd~K^sIb-6)|LctbaZ4t
zqp7JWCB~#2b~TuM(8>VOXjGJ!mnQ%+9hgqS;c(J2^Nu9A?7;f^`o!GaoZ}8{Y-~(=
z$mZsz<4znL98Ah_@<E<8SY2J67#kaNOdr$J(@EF)J~chya-N@`X9p%{efibr?Ci{z
z(>OUf5k*Bs_8blG?d@rwk&>OvJf@Q}Fm5=Hak|mX`dKYyIs*)i8-ljHJ?8*VcP#Pi
zPR_x2;C<{dIW~0@v<{ftDfrVFz@YZ|e2ICwe~3NF_t9s!THK}tzv?x0L#TohOoT!q
zTR2a5zti*6o|Uqfbe95C$;8BjJwG@&5RphEqvV_JtVF+>@=nnOLy(=Fo&Tzo$YYk%
zQsP;2w!6D~to$JF<r~^W+r*IMu{eG4du?s)pr)p#L=Mh;RpOW~FwLM%v`q|gx!Z#s
z9jxu1gPzUK&h`cZfwD~B{j(|CwzjqohlYl*Z}ATF77Jdm7iBOvRl#@~zW@ct$H%)m
zJ3D=TzrQ$7O%-c#aWOPHI*Og1FQC_W{)3Le-X(*%sNICgr~&i@)D9}A(mh`z1X=@q
z!2Sw#dm_MOF_=N|<|UYi_|Auw8I|t2ZrsHw&@t$LfPP9bb_q;zwLgX>dJ(mxyaeUW
z6Br(-=hRg^rTK+Ze~jTwYHxZ7%9JbQ9D-Q{5+%hrk2!(KWx9)$YbX_t6;J8G7TW0r
gumadE8h-^C0F%>?^?8p^)Bpeg07*qoM6N<$f&vUcn*aa+

diff --git a/res/drawable/plus_pressed.png b/res/drawable/plus_pressed.png
deleted file mode 100644
index 872f092a86a48be4b978bf84cbed199e8d63792e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1564
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
O0000<MNUMnLSTZK0q}YN

diff --git a/res/drawable/plus_selected.png b/res/drawable/plus_selected.png
deleted file mode 100644
index 32c441f07df7bf5264aca14d5978065ad3f2f390..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/res/layout/gestures.xml b/res/layout/gestures.xml
deleted file mode 100644
index a22ce0674f..0000000000
--- a/res/layout/gestures.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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.
--->
-
-<!-- TODO: Replace all this with a RelativeLayout -->
-<com.android.launcher.GesturesPanel
-    xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    
-    android:paddingLeft="13dip"
-    android:paddingRight="13dip"
-    
-    android:orientation="vertical"
-    android:background="@drawable/gestures_background">
-
-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        
-        android:paddingTop="13dip"
-        android:paddingBottom="13dip">
-        
-        <TextView
-            android:id="@+id/gestures_prompt"
-            android:layout_width="fill_parent"
-            android:layout_height="64dip"
-            
-            android:gravity="center"
-            android:textAppearance="?android:attr/textAppearanceLargeInverse"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:text="@string/gestures_instructions" />
-
-        <Button
-            android:id="@+id/gestures_action"
-            android:layout_width="fill_parent"
-            android:layout_height="64dip"
-
-            android:gravity="left|center_vertical"
-            android:textAppearance="?android:attr/textAppearanceLargeInverse"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:drawablePadding="6dip"
-            
-            android:visibility="gone" />
-        
-    </FrameLayout>
-
-    <android.gesture.GestureOverlayView
-        android:id="@+id/gestures_overlay"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1.0"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
-
-        android:gestureColor="@color/gesture_color"
-        android:uncertainGestureColor="@color/uncertain_gesture_color"
-        android:gestureStrokeType="multiple" />
-
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        
-        android:paddingTop="15dip"
-        android:paddingBottom="13dip">
-
-        <ImageButton
-            android:id="@+id/gestures_add"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            
-            android:background="@drawable/btn_add" />
-        
-        <ImageButton
-            android:id="@+id/gestures_list"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-
-            android:background="@drawable/btn_list" />
-
-    </RelativeLayout>
-
-</com.android.launcher.GesturesPanel>
diff --git a/res/layout/gestures_settings.xml b/res/layout/gestures_settings.xml
deleted file mode 100644
index 712cb22d2d..0000000000
--- a/res/layout/gestures_settings.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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.
--->
-
-<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="0dip"
-        android:layout_alignParentTop="true"
-        android:layout_above="@+id/bottom_bar" />
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="6dip"
-        android:layout_alignParentTop="false"
-        android:layout_above="@+id/bottom_bar"
-
-        android:background="@drawable/mirrored_shadow" />
-
-    <RelativeLayout
-        android:id="@id/bottom_bar"
-
-        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/res/layout/gestures_settings_item.xml b/res/layout/gestures_settings_item.xml
deleted file mode 100644
index 1563dfe501..0000000000
--- a/res/layout/gestures_settings_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-
-    android:drawablePadding="12dip"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
-
-    android:ellipsize="marquee"
-    android:singleLine="true"
-    android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4211a6a236..c1de7f4863 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string>
     <string name="search_hint">"Vyhledávání Google"</string>
     <string name="gadget_error_text">"Problém s načtením widgetu"</string>
-    <string name="gestures_instructions">"Nakreslete gesto"</string>
-    <string name="gestures_add">"Přidat zástupce"</string>
-    <string name="gestures_show">"Zobrazit zástupce"</string>
-    <string name="gestures_unknown">"Nerozpoznáno"</string>
-    <string name="gestures_created">"Bylo přidáno gesto %s"</string>
-    <string name="gestures_failed">"Gesto nebylo možné vytvořit."</string>
-    <string name="gestures_loading">"Načítání gest..."</string>
-    <string name="gestures_empty">"Žádná gesta"</string>
-    <string name="gestures_activity">"Gesta"</string>
-    <string name="gestures_rename">"Přejmenovat"</string>
-    <string name="gestures_delete">"Smazat"</string>
-    <string name="gestures_delete_success">"Gesto bylo smazáno"</string>
-    <string name="gestures_rename_title">"Přejmenovat gesto"</string>
-    <string name="gestures_rename_label">"Název gesta"</string>
-    <string name="gestures_group_gestures">"Gesta"</string>
-    <string name="gestures_group_settings">"Nastavení"</string>
-    <string name="gestures_preference_hotkey_title">"Spouštět tlačítkem plochy"</string>
-    <string name="gestures_preference_hotkey_summary">"Po stisknutí tlačítka plochy kreslit gesta"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c3f75fd6f9..3050f001d4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Tillader et program at ændre indstillingerne og genvejene i Start."</string>
     <string name="search_hint">"Google-søgning"</string>
     <string name="gadget_error_text">"Der er problemer med at indlæse widget"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d77481e90a..4dcb40152c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Ermöglicht einer Anwendung, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
     <string name="search_hint">"Google-Suche"</string>
     <string name="gadget_error_text">"Problem beim Laden des Widgets"</string>
-    <string name="gestures_instructions">"Eine Bewegung zeichnen"</string>
-    <string name="gestures_add">"Verknüpfung hinzufügen"</string>
-    <string name="gestures_show">"Verknüpfung anzeigen"</string>
-    <string name="gestures_unknown">"Nicht erkannt"</string>
-    <string name="gestures_created">"Bewegung %s wurde hinzugefügt."</string>
-    <string name="gestures_failed">"Bewegung konnte nicht erstellt werden."</string>
-    <string name="gestures_loading">"Bewegungen werden geladen..."</string>
-    <string name="gestures_empty">"Keine Bewegungen"</string>
-    <string name="gestures_activity">"Bewegungen"</string>
-    <string name="gestures_rename">"Umbenennen"</string>
-    <string name="gestures_delete">"Löschen"</string>
-    <string name="gestures_delete_success">"Bewegung wurde gelöscht."</string>
-    <string name="gestures_rename_title">"Bewegung umbenennen"</string>
-    <string name="gestures_rename_label">"Name der Bewegung"</string>
-    <string name="gestures_group_gestures">"Bewegungen"</string>
-    <string name="gestures_group_settings">"Einstellungen"</string>
-    <string name="gestures_preference_hotkey_title">"Über Startseite öffnen"</string>
-    <string name="gestures_preference_hotkey_summary">"Drücken Sie die Taste für die Startseite, um Bewegungen zu zeichnen."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 51366c1f7b..c0516b8e60 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Επιτρέπει σε μια εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην αρχική οθόνη."</string>
     <string name="search_hint">"Αναζήτηση Google"</string>
     <string name="gadget_error_text">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a72cdc6ef1..a2f12dc7ed 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Permite a una aplicación cambiar la configuración y los accesos directos de la página principal."</string>
     <string name="search_hint">"Búsqueda de Google"</string>
     <string name="gadget_error_text">"Problema al cargar el widget"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 50e597cb1d..5bef440d66 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Permite que una aplicación modifique la configuración y los accesos directos de la página principal."</string>
     <string name="search_hint">"Búsqueda de Google"</string>
     <string name="gadget_error_text">"Problema al cargar el widget"</string>
-    <string name="gestures_instructions">"Dibujar un gesto"</string>
-    <string name="gestures_add">"Añadir acceso directo"</string>
-    <string name="gestures_show">"Mostrar acceso directo"</string>
-    <string name="gestures_unknown">"No reconocido"</string>
-    <string name="gestures_created">"Gesto %s añadido"</string>
-    <string name="gestures_failed">"No se ha podido crear el gesto."</string>
-    <string name="gestures_loading">"Cargando gestos..."</string>
-    <string name="gestures_empty">"Ningún gesto"</string>
-    <string name="gestures_activity">"Gestos"</string>
-    <string name="gestures_rename">"Cambiar nombre"</string>
-    <string name="gestures_delete">"Suprimir"</string>
-    <string name="gestures_delete_success">"Gesto suprimido"</string>
-    <string name="gestures_rename_title">"Cambiar nombre de gesto"</string>
-    <string name="gestures_rename_label">"Nombre del gesto"</string>
-    <string name="gestures_group_gestures">"Gestos"</string>
-    <string name="gestures_group_settings">"Configuración"</string>
-    <string name="gestures_preference_hotkey_title">"Utilizar la tecla de página principal para iniciar"</string>
-    <string name="gestures_preference_hotkey_summary">"Pulsa la tecla de página principal para dibujar gestos."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d55ef0c651..91bea49ea5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string>
     <string name="search_hint">"Recherche Google"</string>
     <string name="gadget_error_text">"Problème lors du chargement du widget"</string>
-    <string name="gestures_instructions">"Créer un geste"</string>
-    <string name="gestures_add">"Ajouter un raccourci"</string>
-    <string name="gestures_show">"Afficher le raccourci"</string>
-    <string name="gestures_unknown">"Non reconnu"</string>
-    <string name="gestures_created">"Le geste %s a bien été ajouté."</string>
-    <string name="gestures_failed">"Impossible de créer le geste."</string>
-    <string name="gestures_loading">"Chargement des gestes en cours…"</string>
-    <string name="gestures_empty">"Aucun geste"</string>
-    <string name="gestures_activity">"Gestes"</string>
-    <string name="gestures_rename">"Renommer"</string>
-    <string name="gestures_delete">"Supprimer"</string>
-    <string name="gestures_delete_success">"Le geste a bien été supprimé."</string>
-    <string name="gestures_rename_title">"Renommer le geste"</string>
-    <string name="gestures_rename_label">"Nom du geste"</string>
-    <string name="gestures_group_gestures">"Gestes"</string>
-    <string name="gestures_group_settings">"Paramètres"</string>
-    <string name="gestures_preference_hotkey_title">"Utiliser la touche Accueil pour commencer"</string>
-    <string name="gestures_preference_hotkey_summary">"Appuyer sur la touche Accueil pour créer un geste"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 605fb511de..404bb3a948 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Consente a un\'applicazione di modificare le impostazioni e le scorciatoie in Home."</string>
     <string name="search_hint">"Ricerca Google"</string>
     <string name="gadget_error_text">"Errore durante il caricamento del widget"</string>
-    <string name="gestures_instructions">"Traccia un gesto"</string>
-    <string name="gestures_add">"Aggiungi scorciatoia"</string>
-    <string name="gestures_show">"Mostra scorciatoia"</string>
-    <string name="gestures_unknown">"Non riconosciuto"</string>
-    <string name="gestures_created">"Gesto %s aggiunto"</string>
-    <string name="gestures_failed">"Impossibile creare il gesto"</string>
-    <string name="gestures_loading">"Caricamento gesti in corso..."</string>
-    <string name="gestures_empty">"Nessun gesto"</string>
-    <string name="gestures_activity">"Gesti"</string>
-    <string name="gestures_rename">"Rinomina"</string>
-    <string name="gestures_delete">"Elimina"</string>
-    <string name="gestures_delete_success">"Gesto eliminato"</string>
-    <string name="gestures_rename_title">"Rinomina gesto"</string>
-    <string name="gestures_rename_label">"Nome gesto"</string>
-    <string name="gestures_group_gestures">"Gesti"</string>
-    <string name="gestures_group_settings">"Impostazioni"</string>
-    <string name="gestures_preference_hotkey_title">"Utilizza \"home\" per l\'avvio"</string>
-    <string name="gestures_preference_hotkey_summary">"Premi il tasto \"home\" per tracciare gesti"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 91c981291b..c2391c09b8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string>
     <string name="search_hint">"Google検索"</string>
     <string name="gadget_error_text">"ウィジェットを表示できません"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 943c9776fb..43f27a72db 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"응용프로그램이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
     <string name="search_hint">"Google 검색"</string>
     <string name="gadget_error_text">"위젯을 로드하는 중 문제가 발생했습니다."</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a205b22098..8189f091c6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Lar applikasjonen endre innstillinger og snarveier på skrivebordet."</string>
     <string name="search_hint">"Google-søk"</string>
     <string name="gadget_error_text">"Problem under lasting av gadget"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bc12b8052b..f3db12e66c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Hiermee kan een toepassing de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
     <string name="search_hint">"Google Zoeken"</string>
     <string name="gadget_error_text">"Probleem bij het laden van widget"</string>
-    <string name="gestures_instructions">"Een gebaar tekenen"</string>
-    <string name="gestures_add">"Snelkoppeling toevoegen"</string>
-    <string name="gestures_show">"Snelkoppeling weergeven"</string>
-    <string name="gestures_unknown">"Onbekend"</string>
-    <string name="gestures_created">"Gebaar %s toegevoegd"</string>
-    <string name="gestures_failed">"Gebaar kan niet worden gemaakt"</string>
-    <string name="gestures_loading">"Gebaren laden..."</string>
-    <string name="gestures_empty">"Geen gebaren"</string>
-    <string name="gestures_activity">"Gebaren"</string>
-    <string name="gestures_rename">"Naam wijzigen"</string>
-    <string name="gestures_delete">"Verwijderen"</string>
-    <string name="gestures_delete_success">"Gebaar verwijderd"</string>
-    <string name="gestures_rename_title">"Naam van gebaar wijzigen"</string>
-    <string name="gestures_rename_label">"Naam van gebaar"</string>
-    <string name="gestures_group_gestures">"Gebaren"</string>
-    <string name="gestures_group_settings">"Instellingen"</string>
-    <string name="gestures_preference_hotkey_title">"Gebruik de startpaginatoets om te starten"</string>
-    <string name="gestures_preference_hotkey_summary">"Druk op de startpaginatoets om gebaren te tekenen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3f545a3b3b..ac5d9f3c6c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string>
     <string name="search_hint">"Szukaj w Google"</string>
     <string name="gadget_error_text">"Problem podczas ładowania widżetu"</string>
-    <string name="gestures_instructions">"Określ gest"</string>
-    <string name="gestures_add">"Dodaj skrót"</string>
-    <string name="gestures_show">"Pokaż skrót"</string>
-    <string name="gestures_unknown">"Nierozpoznany"</string>
-    <string name="gestures_created">"Dodano gest %s"</string>
-    <string name="gestures_failed">"Nie można utworzyć gestu"</string>
-    <string name="gestures_loading">"Trwa wczytywanie gestów..."</string>
-    <string name="gestures_empty">"Brak gestów"</string>
-    <string name="gestures_activity">"Gesty"</string>
-    <string name="gestures_rename">"Zmień nazwę"</string>
-    <string name="gestures_delete">"Usuń"</string>
-    <string name="gestures_delete_success">"Gest usunięty"</string>
-    <string name="gestures_rename_title">"Zmień nazwę gestu"</string>
-    <string name="gestures_rename_label">"Nazwa gestu"</string>
-    <string name="gestures_group_gestures">"Gesty"</string>
-    <string name="gestures_group_settings">"Ustawienia"</string>
-    <string name="gestures_preference_hotkey_title">"Użyj klawisza głównego, aby uruchomić"</string>
-    <string name="gestures_preference_hotkey_summary">"Naciśnij klawisz główny, aby określić gesty"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b284c485f3..04afce3fd3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Permite que uma aplicação altere as definições e os atalhos do ecrã principal."</string>
     <string name="search_hint">"Pesquisa do Google"</string>
     <string name="gadget_error_text">"Erro ao carregar o widget"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e1dff59b70..a2b3b5c2c3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Permite que um aplicativo altere as configurações e atalhos na Página inicial."</string>
     <string name="search_hint">"Pesquisa do Google"</string>
     <string name="gadget_error_text">"Problema ao carregar o widget"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4bafe9c4c5..dea57b39c8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string>
     <string name="search_hint">"Поиск Google"</string>
     <string name="gadget_error_text">"Не удалось загрузить виджет"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 119bcb112a..142ec0c3d3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Tillåter att ett program ändrar inställningar och genvägar på startsidan."</string>
     <string name="search_hint">"Google Sökning"</string>
     <string name="gadget_error_text">"Det gick inte att läsa in widgeten"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 40ab2ec702..218e50a397 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları değiştirme izni verir."</string>
     <string name="search_hint">"Google Arama"</string>
     <string name="gadget_error_text">"Widget yüklenirken sorun oluştu"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d7ab9df524..fc53e54743 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -65,40 +65,4 @@
     <string name="permdesc_write_settings">"允许应用程序更改主屏幕上的设置和快捷方式。"</string>
     <string name="search_hint">"Google 搜索"</string>
     <string name="gadget_error_text">"载入窗口小部件时出现问题"</string>
-    <!-- no translation found for gestures_instructions (9028212666671537142) -->
-    <skip />
-    <!-- no translation found for gestures_add (7202345623338547552) -->
-    <skip />
-    <!-- no translation found for gestures_show (1819408048115485045) -->
-    <skip />
-    <!-- no translation found for gestures_unknown (4627778271648365869) -->
-    <skip />
-    <!-- no translation found for gestures_created (8116808500193613741) -->
-    <skip />
-    <!-- no translation found for gestures_failed (5113829215530311557) -->
-    <skip />
-    <!-- no translation found for gestures_loading (6325241735907189384) -->
-    <skip />
-    <!-- no translation found for gestures_empty (3992184768829668968) -->
-    <skip />
-    <!-- no translation found for gestures_activity (3366108186921084558) -->
-    <skip />
-    <!-- no translation found for gestures_rename (713510200890627175) -->
-    <skip />
-    <!-- no translation found for gestures_delete (6962559975386260201) -->
-    <skip />
-    <!-- no translation found for gestures_delete_success (2961655691848002690) -->
-    <skip />
-    <!-- no translation found for gestures_rename_title (7463326669074661915) -->
-    <skip />
-    <!-- no translation found for gestures_rename_label (8790363956270703745) -->
-    <skip />
-    <!-- no translation found for gestures_group_gestures (1224781238074132792) -->
-    <skip />
-    <!-- no translation found for gestures_group_settings (2153910512547403584) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_title (293268419666027426) -->
-    <skip />
-    <!-- no translation found for gestures_preference_hotkey_summary (4351473330309584909) -->
-    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 51eb658720..18eb31d988 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -60,22 +60,4 @@
     <string name="permdesc_write_settings">"允許應用程式變更首頁中的設定和捷徑。"</string>
     <string name="search_hint">"Google 搜尋"</string>
     <string name="gadget_error_text">"載入小工具時發生問題"</string>
-    <string name="gestures_instructions">"描繪觸控動作"</string>
-    <string name="gestures_add">"新增捷徑"</string>
-    <string name="gestures_show">"顯示捷徑"</string>
-    <string name="gestures_unknown">"無法辨識"</string>
-    <string name="gestures_created">"已新增觸控動作 %s"</string>
-    <string name="gestures_failed">"無法建立觸控動作"</string>
-    <string name="gestures_loading">"正在載入觸控動作..."</string>
-    <string name="gestures_empty">"無觸控動作"</string>
-    <string name="gestures_activity">"觸控動作"</string>
-    <string name="gestures_rename">"重新命名"</string>
-    <string name="gestures_delete">"刪除"</string>
-    <string name="gestures_delete_success">"已刪除觸控動作"</string>
-    <string name="gestures_rename_title">"重新命名觸控動作"</string>
-    <string name="gestures_rename_label">"觸控動作名稱"</string>
-    <string name="gestures_group_gestures">"觸控動作"</string>
-    <string name="gestures_group_settings">"設定"</string>
-    <string name="gestures_preference_hotkey_title">"使用主螢幕啟動"</string>
-    <string name="gestures_preference_hotkey_summary">"按下主螢幕鍵來描繪觸控動作"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e43459d9ab..4a6d7863a7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -126,44 +126,4 @@
 
     <!-- Text to show user in place of a gadget when we can't display it properly -->
     <string name="gadget_error_text">Problem loading widget</string>
-
-    <!-- Gestures: -->
-    <skip />
-
-    <!-- Message displayed when the user enters gestures mode and is asked to draw a gesture -->
-    <string name="gestures_instructions">Draw a gesture</string>
-    <!-- Label of the button that the user clicks to create a new gesture-based shortcut -->
-    <string name="gestures_add">Add shortcut</string>
-    <!-- Label of the button that the user clicks to see the list of gesture-based shortcuts -->
-    <string name="gestures_show">Show shortcut</string>
-    <!-- Message displayed when the gesture entered by the user cannot be recognized -->
-    <string name="gestures_unknown">Unrecognized</string>
-    <!-- Message displayed when the user has successfully created a new gesture -->
-    <string name="gestures_created">Added gesture "%s"</string>
-    <!-- Message displayed when the user could not create a new gesture -->
-    <string name="gestures_failed">Gesture could not be created</string>
-    <!-- Message displayed when the user opens the gestures settings screen -->
-    <string name="gestures_loading">Loading gestures...</string>
-    <!-- Message displayed when the user has no gestures -->
-    <string name="gestures_empty">No gestures</string>
-    <!-- Title of the screen used to view/manage gestures -->
-    <string name="gestures_activity">Gestures</string>
-    <!-- Noun, menu item used to rename a gesture -->
-    <string name="gestures_rename">Rename</string>
-    <!-- Noun, menu item used to remove a gesture -->
-    <string name="gestures_delete">Delete</string>
-    <!-- Message displayed when a gesture is successfully deleted -->
-    <string name="gestures_delete_success">Gesture deleted</string>
-    <!-- Title of dialog box -->
-    <string name="gestures_rename_title">Rename gesture</string>
-    <!-- Label of gesture name field in Rename gesture dialog box -->
-    <string name="gestures_rename_label">Gesture name</string>
-    <!-- Title of the preferences group showing the user's gestures -->
-    <string name="gestures_group_gestures">Gestures</string>
-    <!-- Title of the preferences group showing the gestures settings -->
-    <string name="gestures_group_settings">Settings</string>
-    <!-- Label of the setting used to enable/disable the home key to draw gestures -->
-    <string name="gestures_preference_hotkey_title">Use home to launch</string>
-    <!-- Summary of the setting used to enable/disable the home key to draw gestures -->
-    <string name="gestures_preference_hotkey_summary">Press home key to draw gestures</string>
 </resources>
diff --git a/src/com/android/launcher/GesturesActivity.java b/src/com/android/launcher/GesturesActivity.java
deleted file mode 100644
index 5c67a1efee..0000000000
--- a/src/com/android/launcher/GesturesActivity.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.launcher;
-
-import android.app.ListActivity;
-import android.app.Dialog;
-import android.app.AlertDialog;
-import android.os.Bundle;
-import android.os.AsyncTask;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-import android.widget.AdapterView;
-import android.widget.Toast;
-import android.widget.EditText;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.view.ContextMenu;
-import android.view.MenuItem;
-import android.gesture.GestureLibrary;
-import android.gesture.Gesture;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.BitmapDrawable;
-import android.text.TextUtils;
-import android.database.DataSetObserver;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Collections;
-import java.util.Map;
-
-public class GesturesActivity extends ListActivity implements AdapterView.OnItemClickListener {
-    private static final int MENU_ID_RENAME = 1;
-    private static final int MENU_ID_REMOVE = 2;
-
-    private static final int DIALOG_RENAME_GESTURE = 1;
-
-    // Type: long (id)
-    private static final String GESTURES_INFO_ID = "gestures.info_id";
-
-    private final Comparator<ApplicationInfo> mSorter =
-            new LauncherModel.ApplicationInfoComparator();
-
-    private GesturesAdapter mAdapter;
-    private GestureLibrary mStore;
-    private GesturesLoadTask mTask;
-
-    private Dialog mRenameDialog;
-    private EditText mInput;
-    private ApplicationInfo mCurrentRenameInfo;
-    private SharedPreferences mPreferences;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.gestures_settings);
-
-        mAdapter = new GesturesAdapter(this);
-        setListAdapter(new GesturesSettingsAdapter(mAdapter));
-        getListView().setOnItemClickListener(this);
-
-        mStore = Launcher.getGestureLibrary(this);
-        mTask = (GesturesLoadTask) new GesturesLoadTask().execute();
-
-        registerForContextMenu(getListView());
-
-        mPreferences = getSharedPreferences(GesturesConstants.PREFERENCES_NAME, MODE_PRIVATE);
-    }
-
-    @SuppressWarnings({ "UnusedDeclaration" })
-    public void back(View v) {
-        finish();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mTask != null && mTask.getStatus() != GesturesLoadTask.Status.FINISHED) {
-            mTask.cancel(true);
-            mTask = null;
-        }
-
-        cleanupRenameDialog();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        if (mCurrentRenameInfo != null) {
-            outState.putLong(GESTURES_INFO_ID, mCurrentRenameInfo.id);
-        }
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle state) {
-        super.onRestoreInstanceState(state);
-
-        long id = state.getLong(GESTURES_INFO_ID, -1);
-        if (id != -1) {
-            mCurrentRenameInfo = Launcher.getModel().queryGesture(this, String.valueOf(id));
-        }
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenu.ContextMenuInfo menuInfo) {
-
-        super.onCreateContextMenu(menu, v, menuInfo);
-
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
-        if (info.position > 2) {
-            menu.setHeaderTitle(((TextView) info.targetView).getText());
-
-            menu.add(0, MENU_ID_RENAME, 0, R.string.gestures_rename);
-            menu.add(0, MENU_ID_REMOVE, 0, R.string.gestures_delete);
-        }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        final AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo)
-                item.getMenuInfo();
-        final ApplicationInfo info = (ApplicationInfo) menuInfo.targetView.getTag();
-
-        switch (item.getItemId()) {
-            case MENU_ID_RENAME:
-                renameGesture(info);
-                return true;
-            case MENU_ID_REMOVE:
-                deleteGesture(info);
-                return true;
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    private void renameGesture(ApplicationInfo info) {
-        mCurrentRenameInfo = info;
-        showDialog(DIALOG_RENAME_GESTURE);
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id) {
-        if (id == DIALOG_RENAME_GESTURE) {
-            return createRenameDialog();
-        }
-        return super.onCreateDialog(id);
-    }
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog) {
-        super.onPrepareDialog(id, dialog);
-        if (id == DIALOG_RENAME_GESTURE && mCurrentRenameInfo != null) {
-            mInput.setText(mCurrentRenameInfo.title);
-        }
-    }
-
-    private Dialog createRenameDialog() {
-        final View layout = View.inflate(this, R.layout.rename_folder, null);
-        mInput = (EditText) layout.findViewById(R.id.folder_name);
-        ((TextView) layout.findViewById(R.id.label)).setText(R.string.gestures_rename_label);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setIcon(0);
-        builder.setTitle(getString(R.string.gestures_rename_title));
-        builder.setCancelable(true);
-        builder.setOnCancelListener(new Dialog.OnCancelListener() {
-            public void onCancel(DialogInterface dialog) {
-                cleanupRenameDialog();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel_action),
-            new Dialog.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    cleanupRenameDialog();
-                }
-            }
-        );
-        builder.setPositiveButton(getString(R.string.rename_action),
-            new Dialog.OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    changeGestureName();
-                }
-            }
-        );
-        builder.setView(layout);
-        return builder.create();
-    }
-
-    private void changeGestureName() {
-        final String name = mInput.getText().toString();
-        if (!TextUtils.isEmpty(name)) {
-            final ApplicationInfo renameInfo = mCurrentRenameInfo;
-            final GesturesActivity.GesturesAdapter adapter = mAdapter;
-            final int count = adapter.getCount();
-
-            // Simple linear search, there should not be enough items to warrant
-            // a more sophisticated search
-            for (int i = 0; i < count; i++) {
-                final ApplicationInfo info = adapter.getItem(i);
-                if (info.id == renameInfo.id) {
-                    info.title = mInput.getText();
-                    LauncherModel.updateGestureInDatabase(this, info);
-                    break;
-                }
-            }
-
-            adapter.notifyDataSetChanged();
-        }
-        mCurrentRenameInfo = null;
-    }
-
-    private void cleanupRenameDialog() {
-        if (mRenameDialog != null) {
-            mRenameDialog.dismiss();
-            mRenameDialog = null;
-        }
-        mCurrentRenameInfo = null;
-    }
-
-    private void deleteGesture(ApplicationInfo info) {
-        mStore.removeEntry(String.valueOf(info.id));
-        // TODO: On a thread?
-        mStore.save();
-
-        final GesturesActivity.GesturesAdapter adapter = mAdapter;
-        adapter.setNotifyOnChange(false);
-        adapter.remove(info);
-        adapter.sort(mSorter);
-        adapter.notifyDataSetChanged();
-
-        LauncherModel.deleteGestureFromDatabase(this, info);
-
-        Toast.makeText(this, R.string.gestures_delete_success, Toast.LENGTH_SHORT).show();
-    }
-
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        if (position == 1) {
-            final CheckBox checkBox = (CheckBox) view.findViewById(R.id.checkbox);
-            checkBox.toggle();
-            mPreferences.edit().putBoolean(GesturesConstants.PREFERENCES_HOME_KEY,
-                    checkBox.isChecked()).commit();
-        }
-    }
-
-    private class GesturesLoadTask extends AsyncTask<Void, ApplicationInfo, Boolean> {
-        private int mThumbnailSize;
-        private int mThumbnailInset;
-        private int mPathColor;
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-
-            final Resources resources = getResources();
-            mPathColor = resources.getColor(R.color.gesture_color);
-            mThumbnailInset = (int) resources.getDimension(R.dimen.gesture_thumbnail_inset);
-            mThumbnailSize = (int) resources.getDimension(R.dimen.gesture_thumbnail_size);
-        }
-
-        protected Boolean doInBackground(Void... params) {
-            if (isCancelled()) return Boolean.FALSE;
-
-            final GestureLibrary store = mStore;
-
-            if (store.load()) {
-                final LauncherModel model = Launcher.getModel();
-
-                for (String name : store.getGestureEntries()) {
-                    if (isCancelled()) break;
-
-                    final Gesture gesture = store.getGestures(name).get(0);
-                    final Bitmap bitmap = gesture.toBitmap(mThumbnailSize, mThumbnailSize,
-                            mThumbnailInset, mPathColor);
-                    final ApplicationInfo info = model.queryGesture(GesturesActivity.this, name);
-
-                    mAdapter.addBitmap(info.id, bitmap);
-                    publishProgress(info);
-                }
-
-                return Boolean.TRUE;
-            }
-
-            return Boolean.FALSE;
-        }
-
-        @Override
-        protected void onProgressUpdate(ApplicationInfo... values) {
-            super.onProgressUpdate(values);
-
-            final GesturesActivity.GesturesAdapter adapter = mAdapter;
-            adapter.setNotifyOnChange(false);
-
-            for (ApplicationInfo info : values) {
-                adapter.add(info);
-            }
-
-            adapter.sort(mSorter);
-            adapter.notifyDataSetChanged();
-        }
-    }
-
-    private class GesturesAdapter extends ArrayAdapter<ApplicationInfo> {
-        private final LayoutInflater mInflater;
-        private final Map<Long, Drawable> mThumbnails = Collections.synchronizedMap(
-                new HashMap<Long, Drawable>());
-
-        public GesturesAdapter(Context context) {
-            super(context, 0);
-            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        }
-
-        void addBitmap(Long id, Bitmap bitmap) {
-            mThumbnails.put(id, new BitmapDrawable(bitmap));
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.gestures_settings_item, parent, false);
-            }
-
-            final ApplicationInfo info = getItem(position);
-            final TextView label = (TextView) convertView;
-
-            label.setTag(info);
-            label.setText(info.title);
-            label.setCompoundDrawablesWithIntrinsicBounds(info.icon, null,
-                    mThumbnails.get(info.id), null);
-
-            return convertView;
-        }
-    }
-
-    private class GesturesSettingsAdapter extends BaseAdapter {
-        private static final int FIXED_CHILDREN_COUNT = 3;
-
-        private static final int VIEW_TYPE_SEPARATOR = 0;
-        private static final int VIEW_TYPE_CHECKBOX = 1;
-
-        private final GesturesAdapter mAdapter;
-        private final LayoutInflater mInflater;
-
-        public GesturesSettingsAdapter(GesturesAdapter adapter) {
-            mAdapter = adapter;
-            mInflater = adapter.mInflater;
-            adapter.registerDataSetObserver(new DataSetObserver() {
-                @Override
-                public void onChanged() {
-                    notifyDataSetChanged();
-                }
-
-                @Override
-                public void onInvalidated() {
-                    notifyDataSetInvalidated();
-                }
-            });
-        }
-
-        public int getCount() {
-            return FIXED_CHILDREN_COUNT + mAdapter.getCount();
-        }
-
-        public Object getItem(int position) {
-            if (position < FIXED_CHILDREN_COUNT) {
-                return String.valueOf(position);
-            }
-            return mAdapter.getItem(position - FIXED_CHILDREN_COUNT);
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            if (position < FIXED_CHILDREN_COUNT) {
-                switch (position) {
-                    case 0:
-                    case 2:
-                        return VIEW_TYPE_SEPARATOR;
-                    case 1:
-                        return VIEW_TYPE_CHECKBOX;
-                }
-            }
-            return 2 + super.getItemViewType(position);
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2 + mAdapter.getViewTypeCount();
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return position != 0 && position != 2;
-        }
-
-        public View getView(int position, View convertView, ViewGroup parent) {
-            if (position < FIXED_CHILDREN_COUNT) {
-                // NOTE: Don't bother with ViewHolders here, we only have 3 items and
-                //       the list is likely to not be very long
-                switch (position) {
-                    case 0:
-                        convertView = createHeader(convertView, parent,
-                                R.string.gestures_group_settings);
-                        break;
-                    case 1:
-                        convertView = createSetting(convertView, parent,
-                                R.string.gestures_preference_hotkey_title,
-                                R.string.gestures_preference_hotkey_summary);
-                        break;
-                    case 2:
-                        convertView = createHeader(convertView, parent,
-                                R.string.gestures_group_gestures);
-                        break;
-                }
-                return convertView;
-            }
-            return mAdapter.getView(position - FIXED_CHILDREN_COUNT, convertView, parent);
-        }
-
-        private View createSetting(View convertView, ViewGroup parent,
-                int title, int summary) {
-
-            if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.list_checkbox_2lines, parent, false);
-            }
-
-            ((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(GesturesConstants.PREFERENCES_HOME_KEY, false));
-
-            return convertView;
-        }
-
-        private View createHeader(View convertView, ViewGroup parent, int text) {
-            if (convertView == null) {
-                convertView = mInflater.inflate(R.layout.list_category, parent, false);
-            }
-            ((TextView) convertView).setText(text);
-            return convertView;
-        }
-    }
-}
diff --git a/src/com/android/launcher/GesturesConstants.java b/src/com/android/launcher/GesturesConstants.java
deleted file mode 100644
index 93a1f10ba8..0000000000
--- a/src/com/android/launcher/GesturesConstants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.launcher;
-
-interface GesturesConstants {
-    final double PREDICTION_THRESHOLD = 1.0;
-    final String STORE_NAME = "gestures";
-    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/GesturesPanel.java b/src/com/android/launcher/GesturesPanel.java
deleted file mode 100644
index c0fce472e8..0000000000
--- a/src/com/android/launcher/GesturesPanel.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.launcher;
-
-import android.widget.LinearLayout;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-
-public class GesturesPanel extends LinearLayout {
-    public GesturesPanel(Context context) {
-        super(context);
-    }
-
-    public GesturesPanel(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public boolean isOpaque() {
-        return true;
-    }
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        final int keyCode = event.getKeyCode();
-        
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_VOLUME_UP:
-            case KeyEvent.KEYCODE_VOLUME_DOWN:
-            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
-            case KeyEvent.KEYCODE_MUTE:
-            case KeyEvent.KEYCODE_HEADSETHOOK:
-            case KeyEvent.KEYCODE_MEDIA_STOP:
-            case KeyEvent.KEYCODE_MEDIA_NEXT:
-            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-            case KeyEvent.KEYCODE_MEDIA_REWIND:
-            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
-            case KeyEvent.KEYCODE_CAMERA:
-            case KeyEvent.KEYCODE_CALL:
-            case KeyEvent.KEYCODE_SEARCH:
-                return ((Launcher) mContext).getWorkspace().getRootView().dispatchKeyEvent(event);
-        }
-        
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                ((Launcher) mContext).hideGesturesPanel();
-                return true;
-            }
-        } else {
-            return super.dispatchKeyEvent(event);
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 25ad4e5756..3fd141d5a0 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -32,7 +32,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.content.Intent.ShortcutIconResource;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ -67,8 +66,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.MotionEvent;
-import android.view.Gravity;
 import android.view.View.OnLongClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
@@ -76,16 +73,8 @@ import android.widget.GridView;
 import android.widget.SlidingDrawer;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.ImageView;
-import android.widget.PopupWindow;
-import android.widget.Button;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
-import android.gesture.GestureOverlayView;
-import android.gesture.GestureLibraries;
-import android.gesture.GestureLibrary;
-import android.gesture.Gesture;
-import android.gesture.Prediction;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -106,9 +95,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     private static final boolean PROFILE_DRAWER = false;
     private static final boolean PROFILE_ROTATE = false;
     private static final boolean DEBUG_USER_INTERFACE = false;
-    private static final boolean DEBUG_GESTURES = false;
-
-    private static final boolean CONFIG_GESTURES_IMMEDIATE_MODE = true;
 
     private static final int WALLPAPER_SCREENS_SPAN = 2;
 
@@ -117,8 +103,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     private static final int MENU_WALLPAPER_SETTINGS = MENU_ADD + 1;
     private static final int MENU_SEARCH = MENU_WALLPAPER_SETTINGS + 1;
     private static final int MENU_NOTIFICATIONS = MENU_SEARCH + 1;
-    private static final int MENU_GESTURES = MENU_NOTIFICATIONS + 1;
-    private static final int MENU_SETTINGS = MENU_GESTURES + 1;
+    private static final int MENU_SETTINGS = MENU_NOTIFICATIONS + 1;
 
     private static final int REQUEST_CREATE_SHORTCUT = 1;
     private static final int REQUEST_CREATE_LIVE_FOLDER = 4;
@@ -127,9 +112,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     private static final int REQUEST_PICK_SHORTCUT = 7;
     private static final int REQUEST_PICK_LIVE_FOLDER = 8;
     private static final int REQUEST_PICK_APPWIDGET = 9;
-    private static final int REQUEST_PICK_GESTURE_ACTION = 10;
-    private static final int REQUEST_CREATE_GESTURE_ACTION = 11;
-    private static final int REQUEST_CREATE_GESTURE_APPLICATION_ACTION = 12;
 
     static final String EXTRA_SHORTCUT_DUPLICATE = "duplicate";
 
@@ -172,12 +154,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     private static final String RUNTIME_STATE_PENDING_FOLDER_RENAME = "launcher.rename_folder";
     // Type: long
     private static final String RUNTIME_STATE_PENDING_FOLDER_RENAME_ID = "launcher.rename_folder_id";
-    // Type: Gesture (Parcelable)
-    private static final String RUNTIME_STATE_PENDING_GESTURE = "launcher.gesture";
-    // Type: boolean
-    private static final String RUNTIME_STATE_GESTURES_PANEL = "launcher.gesture_panel_showing";
-    // Type: Gesture (Parcelable)
-    private static final String RUNTIME_STATE_GESTURES_PANEL_GESTURE = "launcher.gesture_panel_gesture";
 
     private static final LauncherModel sModel = new LauncherModel();
 
@@ -188,8 +164,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
 
     private static WallpaperIntentReceiver sWallpaperReceiver;
 
-    private static GestureLibrary sLibrary;
-
     private final BroadcastReceiver mApplicationsReceiver = new ApplicationsIntentReceiver();
     private final ContentObserver mObserver = new FavoritesChangeObserver();
 
@@ -230,24 +204,11 @@ public final class Launcher extends Activity implements View.OnClickListener, On
 
     private DesktopBinder mBinder;
 
-    private View mGesturesPanel;
-    private GestureOverlayView mGesturesOverlay;
-    private ImageView mGesturesAdd;
-    private PopupWindow mGesturesWindow;
-    private Launcher.GesturesProcessor mGesturesProcessor;
-    private Gesture mCurrentGesture;
-    private GesturesAction mGesturesAction;
-    private boolean mHideGesturesPanel;
-    private TextView mGesturesPrompt;
-    private Button mGesturesSend;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mInflater = getLayoutInflater();
 
-        getGestureLibrary(this);
-
         mAppWidgetManager = AppWidgetManager.getInstance(this);
 
         mAppWidgetHost = new LauncherAppWidgetHost(this, APPWIDGET_HOST_ID);
@@ -405,11 +366,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
         // For example, the user would PICK_SHORTCUT for "Music playlist", and we
         // launch over to the Music app to actually CREATE_SHORTCUT.
 
-        if (resultCode == RESULT_OK && (mAddItemCellInfo != null ||
-                ((requestCode == REQUEST_PICK_GESTURE_ACTION ||
-                requestCode == REQUEST_CREATE_GESTURE_ACTION ||
-                requestCode == REQUEST_CREATE_GESTURE_APPLICATION_ACTION) && mCurrentGesture != null))) {
-
+        if (resultCode == RESULT_OK && mAddItemCellInfo != null) {
             switch (requestCode) {
                 case REQUEST_PICK_APPLICATION:
                     completeAddApplication(this, data, mAddItemCellInfo, !mDesktopLocked);
@@ -432,16 +389,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
                 case REQUEST_CREATE_APPWIDGET:
                     completeAddAppWidget(data, mAddItemCellInfo, !mDesktopLocked);
                     break;
-                case REQUEST_PICK_GESTURE_ACTION:
-                    processShortcut(data, REQUEST_CREATE_GESTURE_APPLICATION_ACTION,
-                            REQUEST_CREATE_GESTURE_ACTION);
-                    break;
-                case REQUEST_CREATE_GESTURE_ACTION:
-                    completeCreateGesture(data, true);
-                    break;
-                case REQUEST_CREATE_GESTURE_APPLICATION_ACTION:
-                    completeCreateGesture(data, false);
-                    break;
             }
         } else if (requestCode == REQUEST_PICK_APPWIDGET &&
                 resultCode == RESULT_CANCELED && data != null) {
@@ -486,22 +433,9 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     @Override
     protected void onPause() {
         super.onPause();
-        if (mGesturesWindow != null) {
-            mGesturesWindow.setAnimationStyle(0);
-            mGesturesWindow.update();
-        }
         closeDrawer(false);
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-        if (mHideGesturesPanel) {
-            mHideGesturesPanel = false;
-            hideGesturesPanel();
-        }
-    }
-
     @Override
     public Object onRetainNonConfigurationInstance() {
         // Flag any binder to stop early before switching
@@ -589,31 +523,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
             mFolderInfo = sModel.getFolderById(this, id);
             mRestoring = true;
         }
-
-        mCurrentGesture = (Gesture) savedState.get(RUNTIME_STATE_PENDING_GESTURE);
-
-        boolean gesturesShowing = savedState.getBoolean(RUNTIME_STATE_GESTURES_PANEL, false);
-        if (gesturesShowing) {
-            if (mCurrentGesture == null) {
-                mCurrentGesture = (Gesture) savedState.get(RUNTIME_STATE_GESTURES_PANEL_GESTURE);
-            }
-            final Gesture gesture = mCurrentGesture;
-            mWorkspace.post(new Runnable() {
-                public void run() {
-                    showGesturesPanel(false);
-                    if (gesture != null && mWorkspace.getParent() != null) {
-                        mGesturesProcessor.matchGesture(gesture);
-                        mWorkspace.post(new Runnable() {
-                            public void run() {
-                                if (gesture != null && mWorkspace.getParent() != null) {
-                                    mGesturesOverlay.setGesture(gesture);
-                                }
-                            }
-                        });
-                    }
-                }
-            });
-        }
     }
 
     /**
@@ -661,72 +570,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
         dragLayer.setIgnoredDropTarget(grid);
         dragLayer.setDragScoller(workspace);
         dragLayer.setDragListener(deleteZone);
-
-        mGesturesPanel = mInflater.inflate(R.layout.gestures, mDragLayer, false);
-        final View gesturesPanel = mGesturesPanel;
-
-        mGesturesAction = new GesturesAction();
-
-        mGesturesPrompt = (TextView) gesturesPanel.findViewById(R.id.gestures_prompt);
-        mGesturesSend = (Button) gesturesPanel.findViewById(R.id.gestures_action);
-        mGesturesSend.setOnClickListener(mGesturesAction);
-       
-        mGesturesAdd = (ImageView) gesturesPanel.findViewById(R.id.gestures_add);
-        final ImageView gesturesAdd = mGesturesAdd;
-        gesturesAdd.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                createGesture();
-            }
-        });
-
-        gesturesPanel.findViewById(R.id.gestures_list).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                startActivity(new Intent(Launcher.this, GesturesActivity.class));
-            }
-        });
-
-        mGesturesOverlay = (GestureOverlayView) gesturesPanel.findViewById(R.id.gestures_overlay);
-        mGesturesProcessor = new GesturesProcessor();
-
-        final GestureOverlayView overlay = mGesturesOverlay;
-        overlay.addOnGestureListener(mGesturesProcessor);
-    }
-
-    private void createGesture() {
-        if (!mWaitingForResult) {
-            mCurrentGesture = mGesturesOverlay.getGesture();
-            mWaitingForResult = true;
-            pickShortcut(REQUEST_PICK_GESTURE_ACTION, R.string.title_select_shortcut);
-        }
-    }
-
-    private void completeCreateGesture(Intent data, boolean isShortcut) {
-        ApplicationInfo info;
-
-        if (isShortcut) {
-            info = infoFromShortcutIntent(this, data);
-        } else {
-            info = infoFromApplicationIntent(this, data);
-        }
-
-        boolean success = false;
-        if (info != null) {
-            info.isGesture = true;
-
-            if (LauncherModel.addGestureToDatabase(this, info, false)) {
-                mGesturesProcessor.addGesture(String.valueOf(info.id), mCurrentGesture);
-                mGesturesProcessor.update(info, mCurrentGesture);
-                Toast.makeText(this, getString(R.string.gestures_created, info.title),
-                        Toast.LENGTH_SHORT).show();
-                success = true;
-            }
-        }
-
-        if (!success) {
-            Toast.makeText(this, getString(R.string.gestures_failed), Toast.LENGTH_SHORT).show();
-        }
-
-        mCurrentGesture = null;
     }
 
     /**
@@ -977,32 +820,8 @@ public final class Launcher extends Activity implements View.OnClickListener, On
             if ((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) !=
                     Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) {
 
-                // TODO: This really should not be done here every time
-                final SharedPreferences preferences =
-                        getSharedPreferences(GesturesConstants.PREFERENCES_NAME, MODE_PRIVATE);
-                final boolean homeKey = preferences.getBoolean(
-                        GesturesConstants.PREFERENCES_HOME_KEY, false);
-
-                if (!homeKey) {
-                    if (!mWorkspace.isDefaultScreenShowing()) {
-                        mWorkspace.moveToDefaultScreen();
-                    }
-
-                    if (mGesturesWindow == null || mGesturesWindow.isShowing()) {
-                        hideGesturesPanel();
-                    }                    
-                } else {
-                    if (mGesturesPanel != null && mDragLayer.getWindowVisibility() == View.VISIBLE
-                            && (mDragLayer.hasWindowFocus() || (mGesturesWindow != null
-                            && mGesturesWindow.isShowing()))) {
-
-                        SearchManager searchManager =
-                                (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-
-                        if (!searchManager.isVisible()) {
-                            onHomeKeyPressed();
-                        }
-                    }
+                if (!mWorkspace.isDefaultScreenShowing()) {
+                    mWorkspace.moveToDefaultScreen();
                 }
 
                 closeDrawer();
@@ -1019,83 +838,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
         }
     }
 
-    private void onHomeKeyPressed() {
-        if (mGesturesWindow == null || !mGesturesWindow.isShowing()) {
-            showGesturesPanel();
-        } else {
-            hideGesturesPanel();
-        }
-    }
-
-    private void showGesturesPanel() {
-        showGesturesPanel(true);
-    }
-
-    private void showGesturesPanel(boolean animate) {
-        resetGesturesPrompt();
-
-        mGesturesAdd.setVisibility(View.GONE);
-
-        mGesturesOverlay.clear(false);
-
-        PopupWindow window;
-        if (mGesturesWindow == null) {
-            mGesturesWindow = new PopupWindow(this);
-            window = mGesturesWindow;
-            window.setFocusable(true);
-            window.setTouchable(true);
-            window.setBackgroundDrawable(getResources().getDrawable(
-                    android.R.drawable.screen_background_dark));
-            window.setContentView(mGesturesPanel);
-        } else {
-            window = mGesturesWindow;
-        }
-        window.setAnimationStyle(animate ? com.android.internal.R.style.Animation_Toast : 0);
-
-        final int[] xy = new int[2];
-        final DragLayer dragLayer = mDragLayer;
-        dragLayer.getLocationOnScreen(xy);
-
-        window.setWidth(dragLayer.getWidth());
-        window.setHeight(dragLayer.getHeight() - 1);
-        window.showAtLocation(dragLayer, Gravity.TOP | Gravity.LEFT, xy[0], xy[1] + 1);
-    }
-
-    private void resetGesturesPrompt() {
-        mGesturesAction.intent = null;
-        mGesturesPrompt.setText(R.string.gestures_instructions);
-        mGesturesPrompt.setVisibility(View.VISIBLE);
-        mGesturesSend.setVisibility(View.GONE);
-    }
-
-    private void setGestureUnknown() {
-        mGesturesAction.intent = null;
-        mGesturesPrompt.setText(R.string.gestures_unknown);
-        mGesturesPrompt.setVisibility(View.VISIBLE);
-        mGesturesSend.setVisibility(View.GONE);
-    }
-
-    private void setGestureAction(Drawable icon, CharSequence title) {
-        mGesturesPrompt.setVisibility(View.GONE);
-        mGesturesSend.setVisibility(View.VISIBLE);
-        mGesturesSend.setText(title);
-        mGesturesSend.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
-    }
-
-    void hideGesturesPanel() {
-        hideGesturesPanel(true);
-    }
-
-    void hideGesturesPanel(boolean animate) {
-        if (mGesturesWindow != null) {
-            final PopupWindow popupWindow = mGesturesWindow;
-            popupWindow.setAnimationStyle(animate ?
-                    com.android.internal.R.style.Animation_Toast : 0);
-            popupWindow.update();
-            popupWindow.dismiss();
-        }
-    }
-
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         // Do not call super here
@@ -1146,21 +888,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
             outState.putBoolean(RUNTIME_STATE_PENDING_FOLDER_RENAME, true);
             outState.putLong(RUNTIME_STATE_PENDING_FOLDER_RENAME_ID, mFolderInfo.id);
         }
-
-        if (mCurrentGesture != null && mWaitingForResult) {
-            outState.putParcelable(RUNTIME_STATE_PENDING_GESTURE, mCurrentGesture);
-        }
-
-        if (mGesturesWindow != null && mGesturesWindow.isShowing()) {
-            outState.putBoolean(RUNTIME_STATE_GESTURES_PANEL, true);
-
-            if (mCurrentGesture == null || !mWaitingForResult) {
-                final Gesture gesture = mGesturesOverlay.getGesture();
-                if (gesture != null) {
-                    outState.putParcelable(RUNTIME_STATE_GESTURES_PANEL_GESTURE, gesture);
-                }
-            }
-        }
     }
 
     @Override
@@ -1177,7 +904,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
 
         TextKeyListener.getInstance().release();
 
-        hideGesturesPanel(false);
         mAllAppsGrid.clearTextFilter();
         mAllAppsGrid.setAdapter(null);
         sModel.unbind();
@@ -1280,11 +1006,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
                 .setIcon(com.android.internal.R.drawable.ic_menu_notifications)
                 .setAlphabeticShortcut('N');
 
-        // TODO: Remove
-        menu.add(0, MENU_GESTURES, 0, R.string.menu_gestures)
-                .setIcon(com.android.internal.R.drawable.ic_menu_compose)
-                .setAlphabeticShortcut('G');
-
         final Intent settings = new Intent(android.provider.Settings.ACTION_SETTINGS);
         settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
                 Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
@@ -1321,9 +1042,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
             case MENU_NOTIFICATIONS:
                 showNotifications();
                 return true;
-            case MENU_GESTURES:
-                showGesturesPanel();
-                return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -1852,7 +1570,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
     }
 
     void startActivitySafely(Intent intent) {
-        mHideGesturesPanel = true;
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         try {
             startActivity(intent);
@@ -1979,14 +1696,6 @@ public final class Launcher extends Activity implements View.OnClickListener, On
         return sModel;
     }
 
-    static GestureLibrary getGestureLibrary(Context context) {
-        if (sLibrary == null) {
-            // The context is not kept by the library so it's safe to do this
-            sLibrary = GestureLibraries.fromPrivateFile(context, GesturesConstants.STORE_NAME);
-        }
-        return sLibrary;
-    }
-
     void closeAllApplications() {
         mDrawer.close();
     }
@@ -2511,139 +2220,4 @@ public final class Launcher extends Activity implements View.OnClickListener, On
             }
         }
     }
-
-    private class GesturesProcessor implements GestureOverlayView.OnGestureListener {
-
-        private final GestureMatcher mMatcher = new GestureMatcher();
-
-        GesturesProcessor() {
-            // TODO: Maybe the load should happen on a background thread?
-            sLibrary.load();
-        }
-
-        public void onGestureStarted(GestureOverlayView overlay, MotionEvent event) {
-            //noinspection PointlessBooleanExpression,ConstantConditions
-            if (!CONFIG_GESTURES_IMMEDIATE_MODE) {
-                overlay.removeCallbacks(mMatcher);
-                resetGesturesPrompt();
-            }
-
-            mGesturesAdd.setVisibility(View.GONE);
-        }
-
-        public void onGesture(GestureOverlayView overlay, MotionEvent event) {
-        }
-
-        public void onGestureEnded(GestureOverlayView overlay, MotionEvent event) {
-            if (CONFIG_GESTURES_IMMEDIATE_MODE) {
-                mMatcher.gesture = overlay.getGesture();
-                if (mMatcher.gesture.getLength() < GesturesConstants.LENGTH_THRESHOLD) {
-                    overlay.clear(false);
-                    if (mGesturesAction.intent != null) {
-                        mGesturesAction.intent = null;
-                        setGestureAction(null, getString(R.string.gestures_unknown));
-                    }
-                } else {
-                    mMatcher.run();
-                }
-            } else {
-                overlay.removeCallbacks(mMatcher);
-
-                mMatcher.gesture = overlay.getGesture();
-                if (mMatcher.gesture.getLength() < GesturesConstants.LENGTH_THRESHOLD) {
-                    overlay.clear(false);
-                    if (mGesturesAction.intent != null) {
-                        mGesturesAction.intent = null;
-                        setGestureAction(null, getString(R.string.gestures_unknown));
-                    }
-                } else {
-                    overlay.postDelayed(mMatcher, GesturesConstants.MATCH_DELAY);
-                }
-            }
-        }
-
-        void matchGesture(Gesture gesture) {
-            mGesturesAdd.setVisibility(View.VISIBLE);
-
-            if (gesture != null) {
-                final ArrayList<Prediction> predictions = sLibrary.recognize(gesture);
-
-                if (DEBUG_GESTURES) {
-                    for (Prediction p : predictions) {
-                        d(LOG_TAG, String.format("name=%s, score=%f", p.name, p.score));
-                    }
-                }
-
-                boolean match = false;
-                if (predictions.size() > 0) {
-                    final Prediction prediction = predictions.get(0);
-                    if (prediction.score > GesturesConstants.PREDICTION_THRESHOLD) {
-                        match = true;
-
-                        ApplicationInfo info = sModel.queryGesture(Launcher.this, prediction.name);
-                        if (info != null) {
-                            updatePrompt(info);
-                        }
-                    }
-                }
-
-                if (!match){
-                    mGesturesAction.intent = null;
-                    setGestureUnknown();
-                }
-            }
-        }
-
-        private void updatePrompt(ApplicationInfo info) {
-            // TODO: BRING BACK            
-            if (mGesturesAction.intent != null &&
-                    info.intent.toUri(0).equals(mGesturesAction.intent.toUri(0)) &&
-                    info.title.equals(mGesturesSend.getText())) {
-                return;
-            }
-
-            setGestureAction(info.icon, info.title);
-
-            mGesturesAction.intent = info.intent;
-        }
-
-        public void onGestureCancelled(GestureOverlayView overlay, MotionEvent event) {
-            //noinspection PointlessBooleanExpression,ConstantConditions
-            if (!CONFIG_GESTURES_IMMEDIATE_MODE) {
-                overlay.removeCallbacks(mMatcher);
-            }
-        }
-
-        void addGesture(String name, Gesture gesture) {
-            sLibrary.addGesture(name, gesture);
-            // TODO: On a background thread?
-            sLibrary.save();
-        }
-
-        void update(ApplicationInfo info, Gesture gesture) {
-            mGesturesOverlay.setGesture(gesture);
-            updatePrompt(info);
-        }
-
-        class GestureMatcher implements Runnable {
-            Gesture gesture;
-
-            public void run() {
-                if (gesture != null) {
-                    matchGesture(gesture);
-                }
-            }
-        }
-    }
-
-    private class GesturesAction implements View.OnClickListener {
-        Intent intent;
-
-        public void onClick(View v) {
-            if (intent != null) {
-                startActivitySafely(intent);
-            }
-        }
-    }
 }
-