commit 6c1c546a98d45c202b549c0710d75680214635b0
author Tadashi G. Takaoka <takaoka@google.com> Fri Nov 04 03:47:01 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 04 03:47:01 2011 -0700
tree 076f114bd996a7b69a022d3a26c621ed5e07804c
parent cb83b300e73700449dec0bd9415d6e1df409c441
parent 28f6948745d0edae874766792a04cec177cc1948

Merge "Fix referring wrong TypedArray"

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 83871a6..139e5ed 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -656,11 +656,16 @@
         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;
         }
     }