am c410e243: Ignore releasing shift key caused by long press

* commit 'c410e243e983e95413dc2fc855a25fc0ede4bf3c':
  Ignore releasing shift key caused by long press
main
Tadashi G. Takaoka 2011-12-04 19:37:33 -08:00 committed by Android Git Automerger
commit 590c825de1
1 changed files with 2 additions and 2 deletions

View File

@ -566,8 +566,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
if (shiftKeyState.isMomentary()) { if (shiftKeyState.isMomentary()) {
// After chording input while normal state. // After chording input while normal state.
toggleShift(); toggleShift();
} else if (isShiftLocked() && !isShiftLockShifted() && shiftKeyState.isPressing() } else if (isShiftLocked() && !isShiftLockShifted() && (shiftKeyState.isPressing()
&& !withSliding) { || shiftKeyState.isPressingOnShifted()) && !withSliding) {
// Shift has been long pressed, ignore this release. // Shift has been long pressed, ignore this release.
} else if (isShiftLocked() && !shiftKeyState.isIgnoring() && !withSliding) { } else if (isShiftLocked() && !shiftKeyState.isIgnoring() && !withSliding) {
// Shift has been pressed without chording while caps lock state. // Shift has been pressed without chording while caps lock state.