diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-17 16:26:41 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-10-17 16:26:42 +0000 |
| commit | d8ba6abfeef1bce43af3e0ac517e20172c9e8cc5 (patch) | |
| tree | 42be9fc58a16b5ddc47eafba2d2adcd6a61fe41b /java/src | |
| parent | 8d757c205293bb2670d6f29a00bd5c369e538da3 (diff) | |
| parent | a3c285e876268a79b4c971b8aa11d430d2addce6 (diff) | |
| download | latinime-d8ba6abfeef1bce43af3e0ac517e20172c9e8cc5.tar.gz latinime-d8ba6abfeef1bce43af3e0ac517e20172c9e8cc5.tar.xz latinime-d8ba6abfeef1bce43af3e0ac517e20172c9e8cc5.zip | |
Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
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(); } |