diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-01 23:53:03 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-01 23:53:03 -0700 |
| commit | ab4d177a0eacad55f66b1bfb7448ab39a636d819 (patch) | |
| tree | c96e55be2f0de2acce74e5ca1883a8ba726c7c56 /java/src | |
| parent | 908170017208ee2cf84d5857cb33e13b0443c919 (diff) | |
| parent | 76c242a1f6ac2f4d50f23214dd8652e398194da9 (diff) | |
| download | latinime-ab4d177a0eacad55f66b1bfb7448ab39a636d819.tar.gz latinime-ab4d177a0eacad55f66b1bfb7448ab39a636d819.tar.xz latinime-ab4d177a0eacad55f66b1bfb7448ab39a636d819.zip | |
am 76c242a1: Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev
* commit '76c242a1f6ac2f4d50f23214dd8652e398194da9':
Fix multi-touch input in auto-caps field
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Keyboard.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 2 |
2 files changed, 1 insertions, 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; |