nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit 'a79431b42b9ef67fc1e68507b5c09f3597fa2121':
  [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
main
Ken Wakasa 2013-10-17 09:30:34 -07:00 committed by Android Git Automerger
parent 1e779e0515 a79431b42b
commit 6032dcf950
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
View File

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