am e00ede53: am 5619d765: Shift/Symbol/Smiley will not disable settings/microphone keys

* commit 'e00ede531fa8f3478207cbde1a03db1904d9e02f':
  Shift/Symbol/Smiley will not disable settings/microphone keys
This commit is contained in:
Tadashi G. Takaoka 2011-11-18 15:28:01 -08:00 committed by Android Git Automerger
commit fb8d1720a4

View file

@ -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