am 0f45e1bf: Fix a bug where autoshift would be ignored coming from emoji

* commit '0f45e1bfbca5c972b46acc1277d5f2fcad4fbf15':
  Fix a bug where autoshift would be ignored coming from emoji
main
Jean Chalard 2013-10-17 07:18:02 -07:00 committed by Android Git Automerger
commit a605db24a6
1 changed files with 3 additions and 0 deletions

View File

@ -327,6 +327,9 @@ public final class KeyboardState {
} }
mIsAlphabetMode = false; mIsAlphabetMode = false;
mIsEmojiMode = true; mIsEmojiMode = true;
// Remember caps lock mode and reset alphabet shift state.
mPrevMainKeyboardWasShiftLocked = mAlphabetShiftState.isShiftLocked();
mAlphabetShiftState.setShiftLocked(false);
mSwitchActions.setEmojiKeyboard(); mSwitchActions.setEmojiKeyboard();
} }