From a3c285e876268a79b4c971b8aa11d430d2addce6 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 11 Oct 2013 19:33:59 +0900 Subject: [PATCH] [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji Bug: 11123691 Change-Id: I36474e12e34af95051129840865015f85595411b --- .../android/inputmethod/keyboard/internal/KeyboardState.java | 3 +++ 1 file changed, 3 insertions(+) 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(); }