aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-11-27 11:30:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-27 11:30:52 -0800
commitb172725c8dc26bc96667135d1b17396f2a6257b4 (patch)
treedacd48648a281680b0e6f81087a77fe41723b801 /java/src
parentb9385ff9be484487a523c1eb6db4eba33ef2359d (diff)
parent7d045829b8cd613ab43cb88b4cf0d4f492827996 (diff)
downloadlatinime-b172725c8dc26bc96667135d1b17396f2a6257b4.tar.gz
latinime-b172725c8dc26bc96667135d1b17396f2a6257b4.tar.xz
latinime-b172725c8dc26bc96667135d1b17396f2a6257b4.zip
am 7d045829: Request update shift state after shift-chording input
* commit '7d045829b8cd613ab43cb88b4cf0d4f492827996': Request update shift state after shift-chording input
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java5
1 files changed, 5 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 5e111fb9a..631e647e8 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
@@ -487,6 +487,11 @@ public final class KeyboardState {
// After chording input while normal state.
setShifted(UNSHIFT);
}
+ // After chording input, automatic shift state may have been changed depending on
+ // what characters were input.
+ mShiftKeyState.onRelease();
+ mSwitchActions.requestUpdatingShiftState();
+ return;
} else if (mAlphabetShiftState.isShiftLockShifted() && withSliding) {
// In shift locked state, shift has been pressed and slid out to other key.
setShiftLocked(true);