diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-17 09:28:49 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-17 09:28:49 -0700 |
| commit | a79431b42b9ef67fc1e68507b5c09f3597fa2121 (patch) | |
| tree | 60fc44b3661d61e583394cf56df7114fbd338470 /java/src | |
| parent | 62bea4d6e0a0c2cc91ef621c583ab2bf3db6c6c8 (diff) | |
| parent | d8ba6abfeef1bce43af3e0ac517e20172c9e8cc5 (diff) | |
| download | latinime-a79431b42b9ef67fc1e68507b5c09f3597fa2121.tar.gz latinime-a79431b42b9ef67fc1e68507b5c09f3597fa2121.tar.xz latinime-a79431b42b9ef67fc1e68507b5c09f3597fa2121.zip | |
am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
* commit 'd8ba6abfeef1bce43af3e0ac517e20172c9e8cc5':
[DO NOT MERGE] 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(); } |