diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-19 02:14:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-19 02:14:15 -0800 |
| commit | 085b659463c41beb01950bf82334f451cca8ed2e (patch) | |
| tree | 63dcb07ebd3b03b4e18b17063cf5e0945a39b3aa /java/src/com/android/inputmethod | |
| parent | 4d229410f0336a56dd9c9a5440aecbbb6a90503a (diff) | |
| parent | d26d63b35d34333a8f6737572b1c306b774eebd0 (diff) | |
Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests"
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index 9bad1a9f3..54b1c1f09 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -338,7 +338,11 @@ public class KeyboardState { final boolean isShiftLocked = mAlphabetShiftState.isShiftLocked(); if (mShiftKeyState.isMomentary()) { // After chording input while normal state. - setShifted(SwitchActions.UNSHIFT); + if (mAlphabetShiftState.isShiftLockShifted()) { + setShiftLocked(true); + } else { + setShifted(SwitchActions.UNSHIFT); + } } else if (isShiftLocked && !mAlphabetShiftState.isShiftLockShifted() && (mShiftKeyState.isPressing() || mShiftKeyState.isPressingOnShifted()) && !withSliding) { |