diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-10-11 19:33:59 +0900 |
|---|---|---|
| committer |   The Android Automerger <android-build@google.com> | 2013-10-22 05:23:47 -0700 |
| commit | 7da2295328a16d061a94c46c4cab21e46370ab41 (patch) | |
| tree | 03011359036d1c34042943940e58ff461549ab08 /java/src | |
| parent | a6ee1e7b9a63fcef6e433c17f32aea90982ababd (diff) | |
| download | latinime-7da2295328a16d061a94c46c4cab21e46370ab41.tar.gz latinime-7da2295328a16d061a94c46c4cab21e46370ab41.tar.xz latinime-7da2295328a16d061a94c46c4cab21e46370ab41.zip | |
Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
Diffstat (limited to 'java/src')
| -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(); } |