commit 44972bcdb6f6dd0e4f02a26f31c7effaf0525403
author Tadashi G. Takaoka <takaoka@google.com> Wed Aug 01 18:55:02 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Aug 01 18:56:11 2012 +0900
tree e7309f75203657a9790645a4153748acc3c67f73
parent 195605084ed156b58f0bae002f121d98c1ace867

Fix multi-touch input in auto-caps field

Bug: 6905194
Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2

java/src/com/android/inputmethod/keyboard/Keyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index f1a35b2..3abe890 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -604,9 +604,6 @@
             }
 
             public float getKeyX(TypedArray keyAttr) {
-                final int widthType = Builder.getEnumValue(keyAttr,
-                        R.styleable.Keyboard_Key_keyWidth, KEYWIDTH_NOT_ENUM);
-
                 final int keyboardRightEdge = mParams.mOccupiedWidth
                         - mParams.mHorizontalEdgesPadding;
                 if (keyAttr.hasValue(R.styleable.Keyboard_Key_keyXPos)) {

java/src/com/android/inputmethod/keyboard/PointerTracker.java

diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 0a284cc..e7e11f4 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -408,7 +408,7 @@
             if (mDrawingProxy != null) {
                 setReleasedKeyGraphics(mCurrentKey);
             }
-            mCurrentKey = newKey;
+            // Keep {@link #mCurrentKey} that comes from previous keyboard.
         }
         final int keyQuarterWidth = mKeyboard.mMostCommonKeyWidth / 4;
         mKeyQuarterWidthSquared = keyQuarterWidth * keyQuarterWidth;