diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-12-04 19:37:33 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-12-04 19:37:33 -0800 |
| commit | 590c825de168e0f918c2c972ec02a399f1991422 (patch) | |
| tree | e73b8194aa3ec5fe13dd091bb642a239d733f7ee /java | |
| parent | c98c467794bb18a702b146e1d0779bee48938f4d (diff) | |
| parent | c410e243e983e95413dc2fc855a25fc0ede4bf3c (diff) | |
| download | latinime-590c825de168e0f918c2c972ec02a399f1991422.tar.gz latinime-590c825de168e0f918c2c972ec02a399f1991422.tar.xz latinime-590c825de168e0f918c2c972ec02a399f1991422.zip | |
am c410e243: Ignore releasing shift key caused by long press
* commit 'c410e243e983e95413dc2fc855a25fc0ede4bf3c':
Ignore releasing shift key caused by long press
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 4d30077e3..1d9ca787f 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -566,8 +566,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha if (shiftKeyState.isMomentary()) { // After chording input while normal state. toggleShift(); - } else if (isShiftLocked() && !isShiftLockShifted() && shiftKeyState.isPressing() - && !withSliding) { + } else if (isShiftLocked() && !isShiftLockShifted() && (shiftKeyState.isPressing() + || shiftKeyState.isPressingOnShifted()) && !withSliding) { // Shift has been long pressed, ignore this release. } else if (isShiftLocked() && !shiftKeyState.isIgnoring() && !withSliding) { // Shift has been pressed without chording while caps lock state. |