commit c410e243e983e95413dc2fc855a25fc0ede4bf3c
author Tadashi G. Takaoka <takaoka@google.com> Mon Dec 05 12:23:38 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Dec 05 12:23:38 2011 +0900
tree e73b8194aa3ec5fe13dd091bb642a239d733f7ee
parent 1acce4219d3e8e2607bfddd171ddeb0c11201ae4

Ignore releasing shift key caused by long press

Bug: 5694715
Change-Id: If7b84f547f5701e84d740f186d284273565b7eba

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 4d30077..1d9ca78 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -566,8 +566,8 @@
             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.