diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 12:56:53 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 12:56:53 -0800 |
| commit | 191d42f739e6de57962b97e6ee770e22036d4cb8 (patch) | |
| tree | 74ac01850cff811d79f6ea38c4ac213a39022e2a /java/src | |
| parent | a305cd62ddf70c1ec6202526f3b872ec6711eb95 (diff) | |
| parent | 5619d7658459d13723b6d7ad8969b249adf9e717 (diff) | |
| download | latinime-191d42f739e6de57962b97e6ee770e22036d4cb8.tar.gz latinime-191d42f739e6de57962b97e6ee770e22036d4cb8.tar.xz latinime-191d42f739e6de57962b97e6ee770e22036d4cb8.zip | |
am 5619d765: Shift/Symbol/Smiley will not disable settings/microphone keys
* commit '5619d7658459d13723b6d7ad8969b249adf9e717':
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 7c27fe957..7ba7f7d27 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1295,13 +1295,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()) { @@ -1370,6 +1374,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mKeyboardSwitcher.onKey(Keyboard.CODE_DUMMY); mJustAddedMagicSpace = false; mEnteredText = text; + mHandler.startKeyTypedTimer(); } @Override |