diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-10-17 07:18:02 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-17 07:18:02 -0700 |
| commit | a605db24a64b4489c4f2d17510d2f501acea7297 (patch) | |
| tree | dd2c3aed9812b5a7faa8bb43a66141b7cd7355dc /java/src | |
| parent | 54d8e410c785b1a9196807fa766853c9d4738fd1 (diff) | |
| parent | 0f45e1bfbca5c972b46acc1277d5f2fcad4fbf15 (diff) | |
| download | latinime-a605db24a64b4489c4f2d17510d2f501acea7297.tar.gz latinime-a605db24a64b4489c4f2d17510d2f501acea7297.tar.xz latinime-a605db24a64b4489c4f2d17510d2f501acea7297.zip | |
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
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(); } |