diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-10-11 19:33:59 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2013-10-17 23:15:09 +0900 |
| commit | a3c285e876268a79b4c971b8aa11d430d2addce6 (patch) | |
| tree | d7ab63df5d2ca8c6c5596ba3865a2989925f8975 /java | |
| parent | cf0a94fa9a7c8a5b259507cab616239f79349444 (diff) | |
| download | latinime-a3c285e876268a79b4c971b8aa11d430d2addce6.tar.gz latinime-a3c285e876268a79b4c971b8aa11d430d2addce6.tar.xz latinime-a3c285e876268a79b4c971b8aa11d430d2addce6.zip | |
[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index 9f9fdaa6f..dd98c1703 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -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(); } |