diff options
| author | Jean Chalard <jchalard@google.com> | 2013-10-11 19:33:59 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2013-10-17 22:58:34 +0900 |
| commit | 0f45e1bfbca5c972b46acc1277d5f2fcad4fbf15 (patch) | |
| tree | 2cf45ada7680287a8551a4904f4fea7874b59010 /java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | |
| parent | 585c67118a475416e495fc2e7fcbf6116c65f8fd (diff) | |
Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/KeyboardState.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(); } |