diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 15:28:01 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 15:28:01 -0800 |
| commit | fb8d1720a4320ba6260ced926c52855937903eb4 (patch) | |
| tree | efa0d745a3a052566de006b5c9bc373e7fcf03e2 /java/src | |
| parent | 0c0beffba0e8d63f7a74dc44e8ccee3a15e58294 (diff) | |
| parent | e00ede531fa8f3478207cbde1a03db1904d9e02f (diff) | |
| download | latinime-fb8d1720a4320ba6260ced926c52855937903eb4.tar.gz latinime-fb8d1720a4320ba6260ced926c52855937903eb4.tar.xz latinime-fb8d1720a4320ba6260ced926c52855937903eb4.zip | |
am e00ede53: am 5619d765: Shift/Symbol/Smiley will not disable settings/microphone keys
* commit 'e00ede531fa8f3478207cbde1a03db1904d9e02f':
Shift/Symbol/Smiley will not disable settings/microphone keys
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 56b376490..73a8f1f8d 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1336,13 +1336,17 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar break; case Keyboard.CODE_SHIFT: // Shift key is handled in onPress() when device has distinct multi-touch panel. - if (!distinctMultiTouch) + if (!distinctMultiTouch) { switcher.toggleShift(); + } + shouldStartKeyTypedTimer = false; break; case Keyboard.CODE_SWITCH_ALPHA_SYMBOL: // Symbol key is handled in onPress() when device has distinct multi-touch panel. - if (!distinctMultiTouch) + if (!distinctMultiTouch) { switcher.changeKeyboardMode(); + } + shouldStartKeyTypedTimer = false; break; case Keyboard.CODE_CANCEL: if (!isShowingOptionDialog()) { @@ -1408,6 +1412,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mKeyboardSwitcher.onKey(Keyboard.CODE_DUMMY); mSpaceState = SPACE_STATE_NONE; mEnteredText = text; + mHandler.startKeyTypedTimer(); } @Override |