diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-19 18:48:02 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-19 18:48:02 +0900 |
| commit | d26d63b35d34333a8f6737572b1c306b774eebd0 (patch) | |
| tree | 5ae3bc88fdb57a735379fba45ba469a7ef988f0e /java/src | |
| parent | 01d9fc966abd59ead120190604198a7d455ba7cd (diff) | |
| download | latinime-d26d63b35d34333a8f6737572b1c306b774eebd0.tar.gz latinime-d26d63b35d34333a8f6737572b1c306b774eebd0.tar.xz latinime-d26d63b35d34333a8f6737572b1c306b774eebd0.zip | |
Fix KeyboardState to pass KeyboardStateMultiTouchTests
Change-Id: If2b9ee7cf3fad7633d64b98758f802792d66f7a8
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) { |