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

* commit 'aa6924e9b2094ae64c8cecf6b5b5c14c0f6fb54a':
  Don't recapitalize on shift while on symbol layout
main
Jean Chalard 2013-04-17 19:47:30 -07:00 committed by Android Git Automerger
commit ca796e2d45
1 changed files with 6 additions and 1 deletions

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()