aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-11-18 15:23:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-18 15:23:14 -0800
commite00ede531fa8f3478207cbde1a03db1904d9e02f (patch)
treeefa0d745a3a052566de006b5c9bc373e7fcf03e2 /java/src/com/android/inputmethod
parent5dc318a3f20bc2e176fb2627f606f3861adf849e (diff)
parent5619d7658459d13723b6d7ad8969b249adf9e717 (diff)
downloadlatinime-e00ede531fa8f3478207cbde1a03db1904d9e02f.tar.gz
latinime-e00ede531fa8f3478207cbde1a03db1904d9e02f.tar.xz
latinime-e00ede531fa8f3478207cbde1a03db1904d9e02f.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/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java9
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