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
2013-10-17 07:18:02 -07:00 · 2013-10-17 07:18:02 -07:00 · a605db24a6
parent 54d8e410c7 0f45e1bfbc
commit a605db24a6
1 changed files with 3 additions and 0 deletions
--- 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();
    }