aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-10-02 07:59:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-02 07:59:08 +0000
commitcd7422f4dfe2bd5708acc6305a4f6dc83767685a (patch)
tree61853fec689e407e438b8ce0248d19adddbde2cc /java/src
parent52c20927a9516a50c8f210b61d18f5744c41923c (diff)
parentf735117d36237f08fd7512789f922f18c6b1aa53 (diff)
downloadlatinime-cd7422f4dfe2bd5708acc6305a4f6dc83767685a.tar.gz
latinime-cd7422f4dfe2bd5708acc6305a4f6dc83767685a.tar.xz
latinime-cd7422f4dfe2bd5708acc6305a4f6dc83767685a.zip
Merge "Fix a pernicious bug with caps."
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java2
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java1
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();
}