diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-10-02 01:00:50 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 01:00:50 -0700 |
| commit | 93c2fa8d3e65ab91898760e64636d5d10942ea17 (patch) | |
| tree | 20a61f5eab11a51c49f1ffbfa5920f162589b34f /java/src | |
| parent | 0fbad0fac461c8d2472fd9918f59c056c0a7c347 (diff) | |
| parent | cd7422f4dfe2bd5708acc6305a4f6dc83767685a (diff) | |
| download | latinime-93c2fa8d3e65ab91898760e64636d5d10942ea17.tar.gz latinime-93c2fa8d3e65ab91898760e64636d5d10942ea17.tar.xz latinime-93c2fa8d3e65ab91898760e64636d5d10942ea17.zip | |
am cd7422f4: Merge "Fix a pernicious bug with caps."
* commit 'cd7422f4dfe2bd5708acc6305a4f6dc83767685a':
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(); } |