commit a3c285e876268a79b4c971b8aa11d430d2addce6
author Jean Chalard <jchalard@google.com> Fri Oct 11 19:33:59 2013 +0900
committer Jean Chalard <jchalard@google.com> Thu Oct 17 23:15:09 2013 +0900
tree d7ab63df5d2ca8c6c5596ba3865a2989925f8975
parent cf0a94fa9a7c8a5b259507cab616239f79349444

[DO NOT MERGE] 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();
     }