aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-12-07 05:50:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-07 05:50:18 -0800
commit8982d240e4db7eda36a7546bbb40457e217fbfed (patch)
treea6e73ac1202debebcaba92be6052fa76ebabcd2d /java
parent658a1dffcb707acd15207ad6181fe0384d4db1ae (diff)
parentb300dbbd39b1aed738028fb538aa935a7fbd2e37 (diff)
downloadlatinime-8982d240e4db7eda36a7546bbb40457e217fbfed.tar.gz
latinime-8982d240e4db7eda36a7546bbb40457e217fbfed.tar.xz
latinime-8982d240e4db7eda36a7546bbb40457e217fbfed.zip
am b300dbbd: Reset saved caps lock sate when new keyboard is loaded
* commit 'b300dbbd39b1aed738028fb538aa935a7fbd2e37': Reset saved caps lock sate when new keyboard is loaded
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 50d963c07..71a71d6fd 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -126,6 +126,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
}
public void restore() {
+ mPrevMainKeyboardWasShiftLocked = false;
if (!mIsValid || mIsAlphabetMode) {
setAlphabetKeyboard();
} else {
@@ -593,6 +594,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
}
}
+ // TODO: Move this variable to KeyboardState.
private boolean mPrevMainKeyboardWasShiftLocked;
private void setSymbolsKeyboard() {