diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-19 02:15:28 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 02:15:28 -0800 |
| commit | 33b1944f921714456ad2a24acbba60266e72e601 (patch) | |
| tree | 63dcb07ebd3b03b4e18b17063cf5e0945a39b3aa /java/src | |
| parent | 35151c67e088029935185a08028e5f5840e7c2b7 (diff) | |
| parent | 085b659463c41beb01950bf82334f451cca8ed2e (diff) | |
| download | latinime-33b1944f921714456ad2a24acbba60266e72e601.tar.gz latinime-33b1944f921714456ad2a24acbba60266e72e601.tar.xz latinime-33b1944f921714456ad2a24acbba60266e72e601.zip | |
am 085b6594: Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests"
* commit '085b659463c41beb01950bf82334f451cca8ed2e':
Fix KeyboardState to pass KeyboardStateMultiTouchTests
Diffstat (limited to 'java/src')
| -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) { |