Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev

2013-10-17 16:26:41 +00:00 · 2013-10-17 16:26:41 +00:00 · d8ba6abfee
parent 8d757c2052 a3c285e876
commit d8ba6abfee
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();
    }