From 44972bcdb6f6dd0e4f02a26f31c7effaf0525403 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 1 Aug 2012 18:55:02 +0900
Subject: [PATCH] Fix multi-touch input in auto-caps field

Bug: 6905194
Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2
---
 java/src/com/android/inputmethod/keyboard/Keyboard.java       | 3 ---
 java/src/com/android/inputmethod/keyboard/PointerTracker.java | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index f1a35b212..3abe890cb 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -604,9 +604,6 @@ public class Keyboard {
             }
 
             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)) {
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 0a284cc8e..e7e11f481 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -408,7 +408,7 @@ public class PointerTracker {
             if (mDrawingProxy != null) {
                 setReleasedKeyGraphics(mCurrentKey);
             }
-            mCurrentKey = newKey;
+            // Keep {@link #mCurrentKey} that comes from previous keyboard.
         }
         final int keyQuarterWidth = mKeyboard.mMostCommonKeyWidth / 4;
         mKeyQuarterWidthSquared = keyQuarterWidth * keyQuarterWidth;