am 78d65873: Merge "Don\'t recapitalize on shift while on symbol layout"

* commit '78d658734dc426ca2170fcdee74819c1f8171b78':
  Don't recapitalize on shift while on symbol layout
This commit is contained in:
Jean Chalard 2013-04-15 22:34:51 -07:00 committed by Android Git Automerger
commit aa6924e9b2

View file

@ -1401,7 +1401,12 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
case Constants.CODE_SHIFT:
// Note: calling back to the keyboard on Shift key is handled in onPressKey()
// and onReleaseKey().
handleRecapitalize();
final Keyboard currentKeyboard = switcher.getKeyboard();
if (null != currentKeyboard && currentKeyboard.mId.isAlphabetKeyboard()) {
// TODO: Instead of checking for alphabetic keyboard here, separate keycodes for
// alphabetic shift and shift while in symbol layout.
handleRecapitalize();
}
break;
case Constants.CODE_SWITCH_ALPHA_SYMBOL:
// Note: calling back to the keyboard on symbol key is handled in onPressKey()