diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-24 01:02:14 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-24 01:02:14 -0800 |
| commit | 9921df9079195fd2e7e6fb02d465bcc3d27adf68 (patch) | |
| tree | 4e6eb38c95961e6fb23be52cf219ee6aabddc37b /java/src/com/android/inputmethod | |
| parent | 55a1bc7e59cda46fe9b0abd1621f669479464e8e (diff) | |
| parent | 83d81f2e34b28e56bb0f8505d2315ae53c8f9eef (diff) | |
| download | latinime-9921df9079195fd2e7e6fb02d465bcc3d27adf68.tar.gz latinime-9921df9079195fd2e7e6fb02d465bcc3d27adf68.tar.xz latinime-9921df9079195fd2e7e6fb02d465bcc3d27adf68.zip | |
am 83d81f2e: Fix sliding shift input in caps lock mode
* commit '83d81f2e34b28e56bb0f8505d2315ae53c8f9eef':
Fix sliding shift input in caps lock mode
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 f89f156ea..5054bd954 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -383,12 +383,16 @@ public class KeyboardState { if (mIsAlphabetMode) { final boolean isShiftLocked = mAlphabetShiftState.isShiftLocked(); if (mShiftKeyState.isMomentary()) { - // After chording input while normal state. if (mAlphabetShiftState.isShiftLockShifted()) { + // After chording input while caps lock state. setShiftLocked(true); } else { + // After chording input while normal state. setShifted(UNSHIFT); } + } else if (mAlphabetShiftState.isShiftLockShifted() && withSliding) { + // In caps lock state, shift has been pressed and slid out to other key. + setShiftLocked(true); } else if (isShiftLocked && !mAlphabetShiftState.isShiftLockShifted() && (mShiftKeyState.isPressing() || mShiftKeyState.isPressingOnShifted()) && !withSliding) { |