aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-08-03 15:08:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-03 15:08:28 -0700
commit99debd7519babd084c9654c29efca84219c76e95 (patch)
tree2addea3468d0720986478bde242d466358cb0a96 /java/src/com/android/inputmethod
parent0f6c8e8aeb18b949fa9586dd9de091027b17e107 (diff)
parent73c02390d31bbf32b78763db66b04004666fb5a3 (diff)
downloadlatinime-99debd7519babd084c9654c29efca84219c76e95.tar.gz
latinime-99debd7519babd084c9654c29efca84219c76e95.tar.xz
latinime-99debd7519babd084c9654c29efca84219c76e95.zip
Merge "Reset keyboard shift lock state when new keyboard is ready"
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 2d08abc19..427b35723 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -364,6 +364,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
}
keyboard.onAutoCorrectionStateChanged(mIsAutoCorrectionActive);
+ keyboard.setShiftLocked(false);
keyboard.setShifted(false);
// If the cached keyboard had been switched to another keyboard while the language was
// displayed on its spacebar, it might have had arbitrary text fade factor. In such case,