diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-10-09 19:32:54 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 19:32:54 -0700 |
| commit | ff95897fea96805d244bff380ea9b57785593c40 (patch) | |
| tree | cb071d533dabf256b3b5dca07a7f6262b8369fa9 /java/src | |
| parent | 14307df8ff5382ed5f522e897435df84ed630da8 (diff) | |
| parent | d0b02b526abcb71245c7f6021170e31988b75bab (diff) | |
| download | latinime-ff95897fea96805d244bff380ea9b57785593c40.tar.gz latinime-ff95897fea96805d244bff380ea9b57785593c40.tar.xz latinime-ff95897fea96805d244bff380ea9b57785593c40.zip | |
am d0b02b52: am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."
* commit 'd0b02b526abcb71245c7f6021170e31988b75bab':
Fix a pernicious bug with caps.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index 9f9fdaa6f..506dfa751 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 @@ public final class KeyboardState { 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; } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 96e16de0d..003dcfb5c 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2929,6 +2929,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen return; } tryFixLyingCursorPosition(); + mKeyboardSwitcher.updateShiftState(); if (tryResumeSuggestions) mHandler.postResumeSuggestions(); } |