From 2315bfc7c8df0f6d9fb627456f2a298f5580b52d Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 29 Aug 2011 21:12:36 +0900
Subject: [PATCH 01/11] Clean up some MiniKeyboard.Builder code

Change-Id: I5832421cab3d496d4bb8a5e9902d0b5f4929fd0b
---
 .../inputmethod/keyboard/KeyboardView.java       | 15 ++++++---------
 .../inputmethod/keyboard/MiniKeyboard.java       | 16 ++++++----------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index bc021a690..dfc893db1 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -681,15 +681,6 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
         }
     }
 
-    // This method is currently being used only by MiniKeyboardBuilder
-    public int getDefaultLabelSizeAndSetPaint(Paint paint) {
-        // For characters, use large font. For labels like "Done", use small font.
-        final int labelSize = mKeyDrawParams.mKeyLabelSize;
-        paint.setTextSize(labelSize);
-        paint.setTypeface(mKeyDrawParams.mKeyTextStyle);
-        return labelSize;
-    }
-
     private static final Rect sTextBounds = new Rect();
 
     private static float getCharHeight(Paint paint) {
@@ -733,6 +724,12 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
         return sTextBounds.width();
     }
 
+    public float getDefaultLabelWidth(CharSequence label, Paint paint) {
+        paint.setTextSize(mKeyDrawParams.mKeyLabelSize);
+        paint.setTypeface(mKeyDrawParams.mKeyTextStyle);
+        return getLabelWidth(label, paint);
+    }
+
     private static void drawIcon(Canvas canvas, Drawable icon, int x, int y, int width,
             int height) {
         canvas.translate(x, y);
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
index 17c253963..8f4791630 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
@@ -236,8 +236,7 @@ public class MiniKeyboard extends Keyboard {
         private static int getMaxKeyWidth(KeyboardView view, CharSequence[] popupCharacters,
                 int minKeyWidth) {
             Paint paint = null;
-            Rect bounds = null;
-            int maxWidth = 0;
+            int maxWidth = minKeyWidth;
             for (CharSequence popupSpec : popupCharacters) {
                 final CharSequence label = PopupCharactersParser.getLabel(popupSpec.toString());
                 // If the label is single letter, minKeyWidth is enough to hold
@@ -247,18 +246,15 @@ public class MiniKeyboard extends Keyboard {
                         paint = new Paint();
                         paint.setAntiAlias(true);
                     }
-                    final int labelSize = view.getDefaultLabelSizeAndSetPaint(paint);
-                    paint.setTextSize(labelSize);
-                    if (bounds == null)
-                        bounds = new Rect();
-                    paint.getTextBounds(label.toString(), 0, label.length(), bounds);
-                    if (maxWidth < bounds.width())
-                        maxWidth = bounds.width();
+                    final int width = (int)view.getDefaultLabelWidth(label, paint);
+                    if (maxWidth < width) {
+                        maxWidth = width;
+                    }
                 }
             }
             final int horizontalPadding = (int) view.getContext().getResources()
                     .getDimension(R.dimen.mini_keyboard_key_horizontal_padding);
-            return Math.max(minKeyWidth, maxWidth + horizontalPadding);
+            return maxWidth + horizontalPadding;
         }
 
         @Override

From 83da6c18fb2314dd45d3244a23ba59a5e0e21cd6 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 29 Aug 2011 20:28:46 +0900
Subject: [PATCH 02/11] Add keyLetterSize and keyLabelSize as KeyboardView
 attribute

Bug: 5023981
Change-Id: Iea7f8f340775cbb093c50d6e741b2f1476e9ac39
---
 java/res/values/attrs.xml                     |  7 +++++-
 .../inputmethod/keyboard/KeyboardView.java    | 23 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 4cabe93a8..8362226d6 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -38,11 +38,16 @@
              checkable+checked+pressed. -->
         <attr name="keyBackground" format="reference" />
 
+        <!-- Size of the text for one letter keys. If not defined, keyLetterRatio takes effect. -->
+        <attr name="keyLetterSize" format="float" />
+        <!-- Size of the text for keys with multiple letters. If not defined, keyLabelRatio takes
+             effect. -->
+        <attr name="keyLabelSize" format="float" />
         <!-- Size of the text for one letter keys, in the proportion of key height. -->
         <attr name="keyLetterRatio" format="float" />
         <!-- Large size of the text for one letter keys, in the proportion of key height. -->
         <attr name="keyLargeLetterRatio" format="float" />
-        <!-- Size of the text for keys with some text, in the proportion of key height. -->
+        <!-- Size of the text for keys with multiple letters, in the proportion of key height. -->
         <attr name="keyLabelRatio" format="float" />
         <!-- Size of the text for hint letter (= one character hint label), in the proportion of
              key height. -->
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index bc021a690..32259442e 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -211,6 +211,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
         private final float mKeyHintLetterRatio;
         private final float mKeyUppercaseLetterRatio;
         private final float mKeyHintLabelRatio;
+        private static final float UNDEFINED_RATIO = -1.0f;
 
         public final Rect mPadding = new Rect();
         public int mKeyLetterSize;
@@ -222,9 +223,21 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
 
         public KeyDrawParams(TypedArray a) {
             mKeyBackground = a.getDrawable(R.styleable.KeyboardView_keyBackground);
-            mKeyLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLetterRatio);
+            if (a.hasValue(R.styleable.KeyboardView_keyLabelSize)) {
+                mKeyLetterRatio = UNDEFINED_RATIO;
+                mKeyLetterSize = a.getDimensionPixelSize(
+                        R.styleable.KeyboardView_keyLetterRatio, 0);
+            } else {
+                mKeyLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLetterRatio);
+            }
             mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);
-            mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio);
+            if (a.hasValue(R.styleable.KeyboardView_keyLabelSize)) {
+                mKeyLabelRatio = UNDEFINED_RATIO;
+                mKeyLabelSize = a.getDimensionPixelSize(
+                        R.styleable.KeyboardView_keyLabelRatio, 0);
+            } else {
+                mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio);
+            }
             mKeyHintLetterRatio = getRatio(a, R.styleable.KeyboardView_keyHintLetterRatio);
             mKeyUppercaseLetterRatio = getRatio(a,
                     R.styleable.KeyboardView_keyUppercaseLetterRatio);
@@ -253,9 +266,11 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
         }
 
         public void updateKeyHeight(int keyHeight) {
-            mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
+            if (mKeyLetterRatio >= 0.0f)
+                mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
             mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
-            mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
+            if (mKeyLabelRatio >= 0.0f)
+                mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
             mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);
             mKeyUppercaseLetterSize = (int)(keyHeight * mKeyUppercaseLetterRatio);
             mKeyHintLabelSize = (int)(keyHeight * mKeyHintLabelRatio);

From aed8598e3f90bd609e4d9072e2579408b9b4b324 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 09:23:23 +0900
Subject: [PATCH 03/11] Add translatable=false to the device list

Bug: 5222586
Change-Id: I0a1dd27c6719d38f6344300fc027162cc47a2976
---
 java/res/values/sudden-jumping-touch-event-device-list.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/res/values/sudden-jumping-touch-event-device-list.xml b/java/res/values/sudden-jumping-touch-event-device-list.xml
index 275a262d9..af1eefc12 100644
--- a/java/res/values/sudden-jumping-touch-event-device-list.xml
+++ b/java/res/values/sudden-jumping-touch-event-device-list.xml
@@ -18,7 +18,7 @@
 */
 -->
 <resources>
-    <string-array name="sudden_jumping_touch_event_device_list">
+    <string-array name="sudden_jumping_touch_event_device_list" translatable="false">
         <!-- Nexus One -->
         <item>passion</item>
         <!-- Droid -->

From 2d80400a23bb2bd777e09421fc76ac632f7ac705 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 14:15:55 +0900
Subject: [PATCH 04/11] Fix keyLetterSize and keyLabelSize format

This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: I375a1647343e1d5fa80b328a6824f6c549135e80
---
 java/res/values/attrs.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 8362226d6..bc1bb0801 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -39,10 +39,10 @@
         <attr name="keyBackground" format="reference" />
 
         <!-- Size of the text for one letter keys. If not defined, keyLetterRatio takes effect. -->
-        <attr name="keyLetterSize" format="float" />
+        <attr name="keyLetterSize" format="dimension" />
         <!-- Size of the text for keys with multiple letters. If not defined, keyLabelRatio takes
              effect. -->
-        <attr name="keyLabelSize" format="float" />
+        <attr name="keyLabelSize" format="dimension" />
         <!-- Size of the text for one letter keys, in the proportion of key height. -->
         <attr name="keyLetterRatio" format="float" />
         <!-- Large size of the text for one letter keys, in the proportion of key height. -->

From 60dfe896d48618f3c57f8566736b9389eb998b8c Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 14:38:19 +0900
Subject: [PATCH 05/11] Update "search" icon

Bug: 5232726
Change-Id: Ie42729d15dad05c1650b021396596c1f09c844c2
---
 .../sym_keyboard_search_holo.png              | Bin 1218 -> 1988 bytes
 .../sym_keyboard_search_holo.png              | Bin 819 -> 1298 bytes
 .../sym_keyboard_search_holo.png              | Bin 1769 -> 2924 bytes
 java/res/values/keyboard-icons-ics.xml        |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/res/drawable-hdpi/sym_keyboard_search_holo.png b/java/res/drawable-hdpi/sym_keyboard_search_holo.png
index 86b925217e7c5aa42606e0841df9d934ba4f8d42..72d9e24bf688aff20bd5183406c6c126bb990ddd 100644
GIT binary patch
delta 1891
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

delta 1165
zcmV;81akYt55ft5iBL{Q4GJ0x0000DNk~Le0000a0000d2m}BC0L`5uy#N3J0%A)?
zL;(MXkIcUS000SaNLh0L002k;002k;M#*bF00009c5p#w0000a0000d08=VROaK4_
z%1J~)R7l6omcNfwRTRg+=f3&5GqYK70f|5$0RmZUBvfdB0)`MeOpH{-!p6S<1ue9&
z(!yW@CKg7;!dReStc)R$7{r9e0-}*bOm-Cw%*^i2d-G=Ay&sF6U1nk4E>L-IUUP5q
zdEayH_ndpB|J$(p7m!SDX&nVg*rS0kIYkST36<?11!c<Q6;^{S?IJl9RAQTs>X4?W
zNDAE4MZ4gCE~}?Z!B|xoBBC0$hfhL35b$_B85tRU`j@l))F`YZ$_8p8l{lbJwN|31
zE4rk==xLqyazIZYWqPN0N?rLCR3RMIa5yA^5d7Kj4C9PZp+c2<*wA~s*G@@E-=$8p
zLUb6Vushri_&NUy4a!8=U^<G_`g_w~yL3bM7**VVO4(_IO97wxmmkaoBBIjY*_}>E
z+UX98Ihn#JhnGAa|Ndy{3!$fnlMoYs#8{3d9CiPl$KMVc^Ztg27>~b=>9n);6h`IA
z$x+h_5?@*~?@UYz>e<JL@!oTalmnWgf^<=tRytZ=`iWQydxi>V8OYcoN%ot_2bmOH
zPq&bNHfm(}1xZyTS*+Cx0Opa#MsGTaSxI6-t5u~jAu*Q+3c86<m>M1XVv1z_23wGB
zDvSmZ-B1g0SOw*|Rx%aRgDN8XSz%-naMaSXDcz($MLE|;g)q^+)}nPQOpNxCFiO3B
z-OwfZit$mc0ufQ0eXT`{_FK8thKQ(lzeq@bNRHE>$dD@$MuFP={#Lt5^Y{K!6mt(3
zqnK?-eu;@g{6Sbll_C)i!%?8j`0TOfT$3iv4_QMA%QYO1a=N?oM~8XluXT?4NgC9s
zQD<WQ`PTVnXmXdk+zHLs8K**t0&Y2Mu|ql)`%m{i*FGfCv@6UgWj%Ye6-msf!*&UO
z+{x%_wzd3y?O*j3Y&mGL^@mz=jN@#Q(9kz;XRGgpYI2U98U)4l>WlS1hf%|~h$&Jr
zt9K7^kR7a3g*$d#Kb9|4?#Ro<o0D&bP&dYo45RMrhH`_O&B<xudi3)0LQd7@tNzrY
zPDwYaM;c40Wu7ouP^O*|#p<Y|juNGR>RT`r<o&bvFo<38`Pt1X%5gtv0K>3g-n<11
zcF&>Set-oO51{g^>p|!GC(pSPVo{MKv8!{wy-|_up+P1ErITmeNr8r7yW%q{J_1NG
z<kg)#?M@152)0S4M+j{Rwf3}oa}b}9WMAhrmQ_+^6sX@mF%zblW}2C+opm`kjpgA`
zf4?!^pH62!o7+GMlU9F<jYKI@u|4U0qouwwVUGtI)PQNwupW<*GyVhZsdl>8RVLY!
zF$Wq*HZ3wYR53I<H8wgkIV~_ZIxsM(E|%W_001R)MObuXVRU6WZEs|0W_bWIFflPL
fFg7hRH&ih+IyE*rGdV3VH##sd*>f&qlamKAe-;o3

diff --git a/java/res/drawable-mdpi/sym_keyboard_search_holo.png b/java/res/drawable-mdpi/sym_keyboard_search_holo.png
index 423dff7f57c485ecc9a83f152b5558d8ac6e0790..709012a73372b53a614461f56e222e5e7ab16ed5 100644
GIT binary patch
delta 1196
zcmV;d1XKI729gRhiBL{Q4GJ0x0000DNk~Le0000U0000Y2nGNE07!^wbN~PV24YJ`
zL;(K){{a7>y{D6rFCc#&0000Y0E@hs!T<mS7D+@wR9M69mrZCLRTze!@661-Nt)lb
zq}Wst6{JvCK`H36u2R7+x>Bj&4@yC_Ehq?55L~FG_|sYyT&dI_#8QKxxKk7{R79kx
z3$3Kssx_^-_TD>l&g<fyNpEA5OeDGxzs*^k@62=F?>qCJ8Tfxc{-v<RCdVhIyK}m8
z1!!twY-Pa_=z!E98_e95hSnSO1o){@=y)NTKn{ezvw^>W$0w%^Nc%I}P<OV=U^~(}
zl~N^ubCQnc;>lTW$AR|L#F&=By%-#!_0=_Zw=*6G`qd$QBk_Y!Ft|+8CLlq|13WY9
zZLi1vn3@<1%Lad!&^0x;*Nlgd6yR_Xc;Z~4Zvh`uU0<U08M@!#9!YhHw;OUhJl3eH
z+`4+2t**Hp&Ui`Ec`xpr$@M1C0s_F)#8`L#vwr7qbkb|UsKmbCNgn}PReD~6-Kxaa
z_a=NP81dqcnOuh#>s`6oRpvK4h4+!t0(ZlCOFyqtau<Kcq@Hl6U_@eaCf6HF9hj&p
zZz%aJNY4pUr|<xf#Z4^^j!CJ(Hc5Etz*5lp@B;UOBrk=nPN9b-{Gn8AHAinesf}6B
zCuL77Mrc`jQqosQ16jy7Rs~Zx)*%u}C%wq&I8&vFs)M8x5}>fI$~qTUc_AdZDvP?K
z?5Bk5JfnYFwH!cGc1ltU*pQ*#Dy5nii4?Aqgs>m0g5^a^(v+lnkA*EjvJ9xp^5)e@
z*GM{5r1kHp&?*;uR0Q$5Bn&-h&=Z|(sWKZ-v*33LOyVt>wJU++=v&yU5+@{G-=};x
zP+trl=d!HbxCMpVB{k%dXMv)MbER=qTkdQ|xX*v2BPKoCr*=5+vi;+e(@i=)U8=CS
z;ab*eY)9dcgb9umwchC}YRiX|3IJ+-p}oV<K}o5^r-J=$mwgyq(gb7*S(-OD6T(i=
z&GDK<l4Q0g^bQ^Z3OZik7c!ztU5i<dZ*4J!1HcuMKxzrTm*j!VB@G}DI)mBM3Sp<D
zQ9yr!7m?NqdyoF%S6ILWFZCe+kS3uROnrVE3fmFa3DuDh<Pu+Cyc?42<&gFK>YB6H
zQWQspMq^H=1m<?zz{vA-ZY(Vd?t&Yg*D5uIx+~hFfI^b}BA2vcIg7X?v&PxG6#Rk6
zoGU-(_PD{-2j|19yfT-{yXZr2d~!Nv_P2k>2;t$5T8O&m;K|UMi{Q(3sD(D?)Hu5d
zUwjaI&4rTFF;eIDq(f`xZoXxE^8yiU)zH^+=~m#hF7&xnZg~GxG4u1Sv3;xvxO6|)
zKXi;_KD^WOj<e~evdSx^xC=f!2k%l0fSG%Tc-OBOxEr1fj2yEh-6}X8r-a$Qba*uF
zkrKQjhiiV6UQnDnvr*n}Gv_`^ht_;dmzn${;4Zj}jPhS=S$`Y<t@smM#EWFW=~`fu
zpaL2fI4v?cR53O>H8wgiI4v+YIxsMp-_Kx^(E=J5I4v?cR53O>H8eUjH!UzXIxsL(
K-`Q-F0s}F#g*WH`

delta 742
zcmbQlwVAEHGr-TCmrII^fq{Y7)59eQNJ{{*6bB2CWZxE20i>9cyxm<G{<rs^*$?D#
z7I;J!18EO1b~~AE2NEnRa7+i%V7&}pRmW9;+N?cY978NlPYto{4t5l=Ex%WtJxMj|
zo}PwMM5m^R=pToawe>D6-D}n^=uo)*Gw}DtjJ09^n6?Vt+&VEgC#R?5M#t?Rjk|IV
zn4ZkK=l$v48C$WNrq6O?N>?SOowF@IZ~L9;|IQ`*RTTs{7@8KWVO2;lIAkbuC~ccz
zdYp2j=)cCcLk{0xDErFF%Idy-{$-QcOI}w2nTy6!tBWtc+hd*Pe{1&3`u3KSn@hOQ
zZg{>=?)s71689O){hj+8r%k#Y`_`uPXz0p-l9>HFT<^Nh|EqAQ=6Trcx7s{L_ZPj_
zv)I*rle_D-#QyHAyxO*AOY`jguPdg_N)U+8Hng*v(cYLSnXls17Rk^)y=9uAz^QhF
zeu=|hvjsJH=1FQ~-QmiQ2rQLuY^~Qh@X>Pn^3)U&b%7V0t5!O(>-!j8ym-!pTjqo4
z-)oI&x8|hkX|Fc8zVm+CZ!2z-m~XPp8ScgFCjPPTsV~h^lkHwDxVZgeUZ2tNJ-WKS
zrdhn#wiZrhWizQ2W8|pVc4hD3V39Kqh23{fmfp}1Y3qF|_R<~gy-r%%4Wh-zf8VjJ
zfA?Ii<Y(BtHPsWkrKaEEZE(1|e#$D_jxWWH2in=0of01^WbXJf&y^{`c126*l1t*j
z8d{vUIs_IghjB!m)~mMXm^?F|UC?0lzCW*m7|v|p<9TiRRPM<$kM1>CE&Zh2Hs^=Z
ziVc19iVuDHGK;~X!DJ2F<QxW;tJQN>{t94jI(S{R^XJi@X}Mj>Eq_EAnd(AJ&bV(l
zRL`K}uk%Iis=sx9km;eE4ZM@<S)|0xbdAhI3{9*|&8&<qbq&m|3=CH2O}jsN19rKa
M#d^t;AF>z%0ERj>5&!@I

diff --git a/java/res/drawable-xhdpi/sym_keyboard_search_holo.png b/java/res/drawable-xhdpi/sym_keyboard_search_holo.png
index 118f4f9aac4a6ca59390d3df1fb5bed7273c15b1..1009706cb43d701be9aabe73d6569f6d4f0c2e88 100644
GIT binary patch
delta 2879
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

delta 1721
zcmV;q21fbp7U>OtiBL{Q4GJ0x0000DNk~Le0000m0000q2m}BC0A`wV8UO$Q0%A)?
zL;(MXkIcUS000SaNLh0L002k;002k;M#*bF00009c5p#w0000m0000q0IGsXQvd)3
z@kvBMR9M5+ms^ZoRT;;BYwf+y{Y+b>H!dw{I<-IzVugf%M2*G^B?JZ`#-tCRi3FcW
zG%*o*G0{kUA>qNq7mYC(@r7CwC1~2jHp-<aDg}mG!4js^mP=<kGw1Am_Fn7H!`^dd
z&RotpQ~Kh!a!z*kUi<s6|N7SV|Go|X?`Bqepyf|xSi7zGPT@Qs3pa(<4zp~w3=m+8
zpV4}1Oq&*e9#4kHA$%X|ODtTna)ZSXVO8f!KF0<&tH!kEIK^puoQxD-@L8(~Sw*U8
zy?@X@;pe=(Tz6#3l)aN3&F*m5sH&3e8uv=bC{opr`uqGzpRV9unNp=k(;vExsw<Qo
zhJ@*EPJq=qZsC_~1W<=_9Of-1nbijB+^ikkh!Mbl37(7|CnZHjLjVX2A))s10Jj(J
zf6YJ5Gv-~ge4ZQCPVQr`a`^w5uSBPa@x~9cJyxNb{#HNZ<>eChJ$I9us;Q(<p#p^p
zRZ>MG?&{7jk~4`C#V3<*tFF>O3Lq4y<oEc;yu93u`;*_Urpk(BWxB&EP(}6h=H$`D
z#fp7@d_3Ez>cC(N8I{%afAQYQW$vrGLS==^S0-c>sG?@_<9MR2w%U&;yA;Xx^KSt|
zpiO*21{gPgqfLfip0NgmCnL27c^W{U_qPzx|1`-c^jG-<PEPKyyG<2^>OVhFJ-f0s
z*-}fb<7%qhZ<8zr%MN`UfTQLW9R1IQ@VH=qmKTxGE?2|SFRc}->VD$dPFd`?t3Eh=
zgaTFCcg`J~)2v$es-a-@cX9?-Q4yRs)A+#}lgGlI;=clPO%cac0W4O#1@ICXZYVhx
zzBI`{K<Hzg_4JJa7@7b~uR$S&xF~?SZ}bDm<+>t(77Pg?K+J-mrfR>b7C^b)L_@EC
zKVNYqfV5DnRRM(OEC^kV#SY;<hp>Jd2%QVh_v395;(Y;Z!S+<)e(p`$&=vu_8@2~A
zaC(j@p*`6)LIzeUfhA17sM|o87fjagaOVvEqc;HSZz3GTps3q{KFM}L8on_o^Nm9P
z(d0X^V#Tk;-&9ReKaH1BphoMuskteCP5G(ctD%wx<bh0Lo=2b^`Z6KG>X8swf~=l>
zmKx|C^E_@q_6r%6)QF#Gx7%u~{oT$^RTRneu1k5>5vuMtOg}j_eL)vA{ZP7PU_I!n
z{8JnUq5Iv}C=n50Wr}95yYqxueePC$Nh82)cq~j9V0qCuSSsn}>@e2~;J4;~Q1y>E
zvb>7}3;{N)C%dx8bR#7Y$UYn$s-4cu(`s#H*yW!^=iP7oezt?|(rC*CC(09eJi=fI
z(^|aWe@36m<rFaf{*G!t!xZhL2dz{GyTP+m(oLOTu~!uUiGQ03oncPvscSD==kJ?i
z+N#m~+CCf|Nv~5-{&W3(I(WQ)SqT7SFhqpyeSS>)>6Q>NuYkpWi+_a&+#dg<q6r)4
zWo}Step>oN^KINx!C!POipDo=U++GxuXC-M3-T&RIL1rS&ueFm$6k2Qe}mnNz{PlV
ztT9R4%OYHiC66J)S6|KEjL&J5y?lgCG?-FiUgd53OmwpH9v)%KhZ5s|9_@C9V6;2A
zo8L9w0<;i|<=+SMEqqY?Y;oHc-v$l=mZ~c6{he(++b1(#9c%WmSe7J3UN|x`QaU6g
zBy{MIk`;L?JU*^!^J4e&EM~S6V2cR#mo_a2UpNxwxhq<45^Bj@iSgRlNS8(5G&f5|
zkNNU6uSrYXgJE}k_r)%Mi%a=%r1+i)X0|2w_yaP%AO(v%*G&?mVN2wSk!qeTAJpr)
z=LHTqi)7#IIxGa21^_=0!k1_Cw43l>Sae*A75JUm*~ZJ4%wXZPHP4g}^7_*AAdJHS
zLw6A?LwFqV$m!ac{l3(*NtlDRBj`ggSj=MNOywy~_QWC$jx?u#a`pL8w!or(mwjZO
zh52jnt&Pvp8K#vU!irMbxUg&D#6&ugOq@D*&&*bp@}~Y0^I$1NUhz7$cGJ4%MN&K&
z7+ofSuGHsUm2i1|Gnb3OA|A!%Wpq2pJ^*1?kU1&jjE4XK03~!qSaf7zbY(hYa%Ew3
zWdJfTF)=MLHZ3v~H&ih+IyE*rGdV3VH##sds4kY@lL`wO7d9<2H&ih+IyE*rGdV3V
PH##sd*>f&qlRFDBmZUK7

diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index 004dab7c5..28859b670 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -25,7 +25,7 @@
         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>
         <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>
         <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item>
-        <item name="iconSearchKey">@drawable/sym_keyboard_search</item>
+        <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item>
         <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>
         <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>
         <item name="iconShortcutForLabel">@drawable/sym_keyboard_label_mic_holo</item>

From 3e63fbe400e9c0888c3829a5f641ffb2dec6379a Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 14:55:56 +0900
Subject: [PATCH 06/11] Fix mismatched attribute in KeyboardView

This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: Ice6d949581aea7ca68799be2b91ff28234dd88d6
---
 java/src/com/android/inputmethod/keyboard/KeyboardView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index d6d0f5c37..d6b7ed05a 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -223,7 +223,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
 
         public KeyDrawParams(TypedArray a) {
             mKeyBackground = a.getDrawable(R.styleable.KeyboardView_keyBackground);
-            if (a.hasValue(R.styleable.KeyboardView_keyLabelSize)) {
+            if (a.hasValue(R.styleable.KeyboardView_keyLetterSize)) {
                 mKeyLetterRatio = UNDEFINED_RATIO;
                 mKeyLetterSize = a.getDimensionPixelSize(
                         R.styleable.KeyboardView_keyLetterRatio, 0);

From 619f707c95113e87afc924ba884639f83a959dad Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 15:19:42 +0900
Subject: [PATCH 07/11] Fix another mismatched attribute in KeyboardView

This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: I1135383ff0f0a2b8a5940d0d5c407fd01706a7f7
---
 .../com/android/inputmethod/keyboard/KeyboardView.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index d6b7ed05a..5f824537e 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -225,19 +225,17 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
             mKeyBackground = a.getDrawable(R.styleable.KeyboardView_keyBackground);
             if (a.hasValue(R.styleable.KeyboardView_keyLetterSize)) {
                 mKeyLetterRatio = UNDEFINED_RATIO;
-                mKeyLetterSize = a.getDimensionPixelSize(
-                        R.styleable.KeyboardView_keyLetterRatio, 0);
+                mKeyLetterSize = a.getDimensionPixelSize(R.styleable.KeyboardView_keyLetterSize, 0);
             } else {
                 mKeyLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLetterRatio);
             }
-            mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);
             if (a.hasValue(R.styleable.KeyboardView_keyLabelSize)) {
                 mKeyLabelRatio = UNDEFINED_RATIO;
-                mKeyLabelSize = a.getDimensionPixelSize(
-                        R.styleable.KeyboardView_keyLabelRatio, 0);
+                mKeyLabelSize = a.getDimensionPixelSize(R.styleable.KeyboardView_keyLabelSize, 0);
             } else {
                 mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio);
             }
+            mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);
             mKeyHintLetterRatio = getRatio(a, R.styleable.KeyboardView_keyHintLetterRatio);
             mKeyUppercaseLetterRatio = getRatio(a,
                     R.styleable.KeyboardView_keyUppercaseLetterRatio);
@@ -268,9 +266,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
         public void updateKeyHeight(int keyHeight) {
             if (mKeyLetterRatio >= 0.0f)
                 mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
-            mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
             if (mKeyLabelRatio >= 0.0f)
                 mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
+            mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
             mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);
             mKeyUppercaseLetterSize = (int)(keyHeight * mKeyUppercaseLetterRatio);
             mKeyHintLabelSize = (int)(keyHeight * mKeyHintLabelRatio);

From be34d973349909196dc3427a5653f4e119092ea7 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 16:48:38 +0900
Subject: [PATCH 08/11] Add hintLabel to Key constructor

This change also partialy reverts I5832421c, because of incorrect
popup mini key width calculation.

Bug: 5023981
Change-Id: I1acde090c01d3d861fcc5559cad81e638de2c2bb
---
 java/src/com/android/inputmethod/keyboard/Key.java    |  6 +++---
 .../android/inputmethod/keyboard/MiniKeyboard.java    | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index f56b52388..e64f14d9b 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -195,15 +195,15 @@ public class Key {
     /**
      * This constructor is being used only for key in popup mini keyboard.
      */
-    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter, int x, int y,
-            int width, int height, int edgeFlags) {
+    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter,
+           CharSequence hintLabel, int x, int y, int width, int height, int edgeFlags) {
         mHeight = height - params.mVerticalGap;
         mHorizontalGap = params.mHorizontalGap;
         mVerticalGap = params.mVerticalGap;
         mVisualInsetsLeft = mVisualInsetsRight = 0;
         mWidth = width - mHorizontalGap;
         mEdgeFlags = edgeFlags;
-        mHintLabel = null;
+        mHintLabel = hintLabel;
         mLabelOption = 0;
         mFunctional = false;
         mSticky = false;
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
index 8f4791630..4a7655e34 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
@@ -17,7 +17,6 @@
 package com.android.inputmethod.keyboard;
 
 import android.graphics.Paint;
-import android.graphics.Rect;
 
 import com.android.inputmethod.keyboard.internal.KeyboardBuilder;
 import com.android.inputmethod.keyboard.internal.KeyboardParams;
@@ -235,6 +234,8 @@ public class MiniKeyboard extends Keyboard {
 
         private static int getMaxKeyWidth(KeyboardView view, CharSequence[] popupCharacters,
                 int minKeyWidth) {
+            final int padding = (int) view.getContext().getResources()
+                    .getDimension(R.dimen.mini_keyboard_key_horizontal_padding);
             Paint paint = null;
             int maxWidth = minKeyWidth;
             for (CharSequence popupSpec : popupCharacters) {
@@ -246,15 +247,13 @@ public class MiniKeyboard extends Keyboard {
                         paint = new Paint();
                         paint.setAntiAlias(true);
                     }
-                    final int width = (int)view.getDefaultLabelWidth(label, paint);
+                    final int width = (int)view.getDefaultLabelWidth(label, paint) + padding;
                     if (maxWidth < width) {
                         maxWidth = width;
                     }
                 }
             }
-            final int horizontalPadding = (int) view.getContext().getResources()
-                    .getDimension(R.dimen.mini_keyboard_key_horizontal_padding);
-            return maxWidth + horizontalPadding;
+            return maxWidth;
         }
 
         @Override
@@ -263,7 +262,7 @@ public class MiniKeyboard extends Keyboard {
             for (int n = 0; n < mPopupCharacters.length; n++) {
                 final CharSequence label = mPopupCharacters[n];
                 final int row = n / params.mNumColumns;
-                final Key key = new Key(mResources, params, label, params.getX(n, row),
+                final Key key = new Key(mResources, params, label, null, params.getX(n, row),
                         params.getY(row), params.mDefaultKeyWidth, params.mDefaultRowHeight,
                         params.getRowFlags(row));
                 params.onAddKey(key);

From 84b1284d01ffa1f730763471e1f2e9eddfb8ddea Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 18:37:19 +0900
Subject: [PATCH 09/11] Revert "Add hintLabel to Key constructor"

This reverts commit be34d973349909196dc3427a5653f4e119092ea7.

Bug: 5023981
Change-Id: I34f75cde035f04a9a82c9259442ed0e255cb7118
---
 java/src/com/android/inputmethod/keyboard/Key.java          | 6 +++---
 java/src/com/android/inputmethod/keyboard/MiniKeyboard.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index e64f14d9b..f56b52388 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -195,15 +195,15 @@ public class Key {
     /**
      * This constructor is being used only for key in popup mini keyboard.
      */
-    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter,
-           CharSequence hintLabel, int x, int y, int width, int height, int edgeFlags) {
+    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter, int x, int y,
+            int width, int height, int edgeFlags) {
         mHeight = height - params.mVerticalGap;
         mHorizontalGap = params.mHorizontalGap;
         mVerticalGap = params.mVerticalGap;
         mVisualInsetsLeft = mVisualInsetsRight = 0;
         mWidth = width - mHorizontalGap;
         mEdgeFlags = edgeFlags;
-        mHintLabel = hintLabel;
+        mHintLabel = null;
         mLabelOption = 0;
         mFunctional = false;
         mSticky = false;
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
index 4a7655e34..f84eb19cd 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
@@ -262,7 +262,7 @@ public class MiniKeyboard extends Keyboard {
             for (int n = 0; n < mPopupCharacters.length; n++) {
                 final CharSequence label = mPopupCharacters[n];
                 final int row = n / params.mNumColumns;
-                final Key key = new Key(mResources, params, label, null, params.getX(n, row),
+                final Key key = new Key(mResources, params, label, params.getX(n, row),
                         params.getY(row), params.mDefaultKeyWidth, params.mDefaultRowHeight,
                         params.getRowFlags(row));
                 params.onAddKey(key);

From 392276d73dd6a1787afd3b859c213378e8e7bdb5 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 18:35:56 +0900
Subject: [PATCH 10/11] Add Key constructor for suggestions pane

Bug: 5023981
Change-Id: I737bacb1a6bb40f70be65d6eff85614afe6c79ed
---
 .../com/android/inputmethod/keyboard/Key.java | 36 +++++++++++--------
 .../inputmethod/keyboard/MiniKeyboard.java    |  2 +-
 .../android/inputmethod/latin/LatinIME.java   |  4 +--
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index f56b52388..c3db1b318 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -26,10 +26,10 @@ import android.util.Xml;
 
 import com.android.inputmethod.keyboard.internal.KeyStyles;
 import com.android.inputmethod.keyboard.internal.KeyStyles.KeyStyle;
-import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
-import com.android.inputmethod.keyboard.internal.KeyboardParams;
 import com.android.inputmethod.keyboard.internal.KeyboardBuilder;
 import com.android.inputmethod.keyboard.internal.KeyboardBuilder.ParseException;
+import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
+import com.android.inputmethod.keyboard.internal.KeyboardParams;
 import com.android.inputmethod.keyboard.internal.PopupCharactersParser;
 import com.android.inputmethod.keyboard.internal.Row;
 import com.android.inputmethod.latin.R;
@@ -184,8 +184,8 @@ public class Key {
         sRtlParenthesisMap.put(right, left);
     }
 
-    public static int getRtlParenthesisCode(int code) {
-        if (sRtlParenthesisMap.containsKey(code)) {
+    public static int getRtlParenthesisCode(int code, boolean isRtl) {
+        if (isRtl && sRtlParenthesisMap.containsKey(code)) {
             return sRtlParenthesisMap.get(code);
         } else {
             return code;
@@ -195,27 +195,35 @@ public class Key {
     /**
      * This constructor is being used only for key in popup mini keyboard.
      */
-    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter, int x, int y,
-            int width, int height, int edgeFlags) {
+    public Key(Resources res, KeyboardParams params, String popupSpec,
+            int x, int y, int width, int height, int edgeFlags) {
+        this(params, getRtlParenthesisCode(PopupCharactersParser.getCode(res, popupSpec),
+                params.mIsRtlKeyboard),
+                popupSpec, null, x, y, width, height, edgeFlags);
+    }
+
+    /**
+     * This constructor is being used only for key in popup suggestions pane.
+     */
+    public Key(KeyboardParams params, int code, String popupSpec, String hintLabel,
+            int x, int y, int width, int height, int edgeFlags) {
         mHeight = height - params.mVerticalGap;
         mHorizontalGap = params.mHorizontalGap;
         mVerticalGap = params.mVerticalGap;
         mVisualInsetsLeft = mVisualInsetsRight = 0;
         mWidth = width - mHorizontalGap;
         mEdgeFlags = edgeFlags;
-        mHintLabel = null;
+        mHintLabel = hintLabel;
         mLabelOption = 0;
         mFunctional = false;
         mSticky = false;
         mRepeatable = false;
         mPopupCharacters = null;
         mMaxPopupColumn = 0;
-        final String popupSpecification = popupCharacter.toString();
-        mLabel = PopupCharactersParser.getLabel(popupSpecification);
-        mOutputText = PopupCharactersParser.getOutputText(popupSpecification);
-        final int code = PopupCharactersParser.getCode(res, popupSpecification);
-        mCode = params.mIsRtlKeyboard ? getRtlParenthesisCode(code) : code;
-        mIcon = params.mIconsSet.getIcon(PopupCharactersParser.getIconId(popupSpecification));
+        mLabel = PopupCharactersParser.getLabel(popupSpec);
+        mOutputText = PopupCharactersParser.getOutputText(popupSpec);
+        mCode = code;
+        mIcon = params.mIconsSet.getIcon(PopupCharactersParser.getIconId(popupSpec));
         // Horizontal gap is divided equally to both sides of the key.
         mX = x + mHorizontalGap / 2;
         mY = y;
@@ -344,7 +352,7 @@ public class Key {
                     Keyboard.CODE_UNSPECIFIED);
             if (code == Keyboard.CODE_UNSPECIFIED && !TextUtils.isEmpty(mLabel)) {
                 final int firstChar = mLabel.charAt(0);
-                mCode = params.mIsRtlKeyboard ? getRtlParenthesisCode(firstChar) : firstChar;
+                mCode = getRtlParenthesisCode(firstChar, params.mIsRtlKeyboard);
             } else if (code != Keyboard.CODE_UNSPECIFIED) {
                 mCode = code;
             } else {
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
index f84eb19cd..ff4e72853 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
@@ -262,7 +262,7 @@ public class MiniKeyboard extends Keyboard {
             for (int n = 0; n < mPopupCharacters.length; n++) {
                 final CharSequence label = mPopupCharacters[n];
                 final int row = n / params.mNumColumns;
-                final Key key = new Key(mResources, params, label, params.getX(n, row),
+                final Key key = new Key(mResources, params, label.toString(), params.getX(n, row),
                         params.getY(row), params.mDefaultKeyWidth, params.mDefaultRowHeight,
                         params.getRowFlags(row));
                 params.onAddKey(key);
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 229bf0f4c..7559108f3 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1708,8 +1708,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
             final int rawPrimaryCode = suggestion.charAt(0);
             // Maybe apply the "bidi mirrored" conversions for parentheses
             final LatinKeyboard keyboard = mKeyboardSwitcher.getLatinKeyboard();
-            final int primaryCode = keyboard.mIsRtlKeyboard
-                    ? Key.getRtlParenthesisCode(rawPrimaryCode) : rawPrimaryCode;
+            final int primaryCode = Key.getRtlParenthesisCode(
+                    rawPrimaryCode, keyboard.mIsRtlKeyboard);
 
             final CharSequence beforeText = ic != null ? ic.getTextBeforeCursor(1, 0) : "";
             final int toLeft = (ic == null || TextUtils.isEmpty(beforeText))

From c06d0ef01ddf286080fd421829a587741b1ebc1b Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 18:56:27 +0900
Subject: [PATCH 11/11] Cleanup keyboard related code a bit

Change-Id: I04f1014ab3b115bd457e25a267d2e46d306c8a0e
---
 .../inputmethod/keyboard/LatinKeyboardView.java   |  2 +-
 .../keyboard/PopupMiniKeyboardView.java           |  4 ++--
 .../keyboard/internal/KeyboardParams.java         | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index 5fa9b8fc4..69cbcb154 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -463,7 +463,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
         mPopupPanelPointerTrackerId = tracker.mPointerId;
 
         final Keyboard keyboard = getKeyboard();
-        mPopupPanel.setShifted(keyboard.isShiftedOrShiftLocked());
+        popupPanel.setShifted(keyboard.isShiftedOrShiftLocked());
         final int pointX = (mConfigShowMiniKeyboardAtTouchedPoint) ? tracker.getLastX()
                 : parentKey.mX + parentKey.mWidth / 2;
         final int pointY = parentKey.mY - keyboard.mVerticalGap;
diff --git a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
index c4428dc60..7ace46cac 100644
--- a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
@@ -197,8 +197,8 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel {
 
     @Override
     public void setShifted(boolean shifted) {
-        final MiniKeyboard miniKeyboard = (MiniKeyboard)getKeyboard();
-        if (miniKeyboard.setShifted(shifted)) {
+        final Keyboard keyboard = getKeyboard();
+        if (keyboard.setShifted(shifted)) {
             invalidateAllKeys();
         }
     }
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java
index 4ccaa72d2..980115200 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java
@@ -64,6 +64,15 @@ public class KeyboardParams {
 
     public int mMostCommonKeyWidth = 0;
 
+    protected void clearKeys() {
+        mKeys.clear();
+        mShiftKeys.clear();
+        mShiftLockKeys.clear();
+        mShiftedIcons.clear();
+        mUnshiftedIcons.clear();
+        clearHistogram();
+    }
+
     public void onAddKey(Key key) {
         mKeys.add(key);
         updateHistogram(key);
@@ -83,6 +92,12 @@ public class KeyboardParams {
     private int mMaxCount = 0;
     private final Map<Integer, Integer> mHistogram = new HashMap<Integer, Integer>();
 
+    private void clearHistogram() {
+        mMostCommonKeyWidth = 0;
+        mMaxCount = 0;
+        mHistogram.clear();
+    }
+
     private void updateHistogram(Key key) {
         final Integer width = key.mWidth + key.mHorizontalGap;
         final int count = (mHistogram.containsKey(width) ? mHistogram.get(width) : 0) + 1;