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