aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-11-04 15:58:49 +0900
committerTadashi G. Takaoka <takaoka@google.com>2011-11-04 17:36:40 +0900
commitcb83b300e73700449dec0bd9415d6e1df409c441 (patch)
tree63e9297c6e0fa96b066fd0410d041133e7ead191 /java/src
parent1e39565bb48d23221145c494d4bf5665b514699d (diff)
downloadlatinime-cb83b300e73700449dec0bd9415d6e1df409c441.tar.gz
latinime-cb83b300e73700449dec0bd9415d6e1df409c441.tar.xz
latinime-cb83b300e73700449dec0bd9415d6e1df409c441.zip
Remember shift locked state when switching between Main keyboard and Symbols
Bug: 5553660 Change-Id: Icb15a9f8a58243bd113c2d4897fee623ac48b66d
Diffstat (limited to 'java/src')
-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;
}
}