commit ff95897fea96805d244bff380ea9b57785593c40
author Jean Chalard <jchalard@google.com> Wed Oct 09 19:32:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 09 19:32:54 2013 -0700
tree cb071d533dabf256b3b5dca07a7f6262b8369fa9
parent 14307df8ff5382ed5f522e897435df84ed630da8
parent d0b02b526abcb71245c7f6021170e31988b75bab

am d0b02b52: am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."

* commit 'd0b02b526abcb71245c7f6021170e31988b75bab':
  Fix a pernicious bug with caps.

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..506dfa7 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
@@ -178,6 +178,8 @@
             if (!state.mIsAlphabetShiftLocked) {
                 setShifted(state.mShiftMode);
             }
+            // TODO: is this the right place to do this? Should we do this in setShift* instead?
+            mSwitchActions.requestUpdatingShiftState();
         } else {
             mPrevMainKeyboardWasShiftLocked = state.mIsAlphabetShiftLocked;
         }

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 96e16de..003dcfb 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2929,6 +2929,7 @@
             return;
         }
         tryFixLyingCursorPosition();
+        mKeyboardSwitcher.updateShiftState();
         if (tryResumeSuggestions) mHandler.postResumeSuggestions();
     }