Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev

This commit is contained in:
Ken Wakasa 2013-10-17 16:26:41 +00:00 committed by Android (Google) Code Review
commit d8ba6abfee

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