aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-11-04 10:42:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-04 10:42:52 +0000
commitd2a18cbdedd813f82089a844b683afe068e47746 (patch)
tree63e9297c6e0fa96b066fd0410d041133e7ead191 /java/src/com/android/inputmethod
parent445cda6011b521d895a6ea1e102a26895901098a (diff)
parentcb83b300e73700449dec0bd9415d6e1df409c441 (diff)
downloadlatinime-d2a18cbdedd813f82089a844b683afe068e47746.tar.gz
latinime-d2a18cbdedd813f82089a844b683afe068e47746.tar.xz
latinime-d2a18cbdedd813f82089a844b683afe068e47746.zip
am cb83b300: Remember shift locked state when switching between Main keyboard and Symbols
* commit 'cb83b300e73700449dec0bd9415d6e1df409c441': Remember shift locked state when switching between Main keyboard and Symbols
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 83871a602..139e5eddf 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -656,11 +656,16 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
return mKeyboardView == null ? 0 : mKeyboardView.getPointerCount();
}
+ private boolean mPrevMainKeyboardWasShiftLocked;
+
private void toggleKeyboardMode() {
if (mCurrentId.equals(mMainKeyboardId)) {
+ mPrevMainKeyboardWasShiftLocked = isShiftLocked();
setKeyboard(getKeyboard(mSymbolsKeyboardId));
} else {
setKeyboard(getKeyboard(mMainKeyboardId));
+ setShiftLocked(mPrevMainKeyboardWasShiftLocked);
+ mPrevMainKeyboardWasShiftLocked = false;
}
}