commit 7da2295328a16d061a94c46c4cab21e46370ab41
author Jean Chalard <jchalard@google.com> Fri Oct 11 19:33:59 2013 +0900
committer The Android Automerger <android-build@google.com> Tue Oct 22 05:23:47 2013 -0700
tree 03011359036d1c34042943940e58ff461549ab08
parent a6ee1e7b9a63fcef6e433c17f32aea90982ababd

Fix a bug where autoshift would be ignored coming from emoji

Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b

java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
index 9f9fdaa..dd98c17 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 @@
         }
         mIsAlphabetMode = false;
         mIsEmojiMode = true;
+        // Remember caps lock mode and reset alphabet shift state.
+        mPrevMainKeyboardWasShiftLocked = mAlphabetShiftState.isShiftLocked();
+        mAlphabetShiftState.setShiftLocked(false);
         mSwitchActions.setEmojiKeyboard();
     }