Merge branch 'readonly-p4-donut' into donut

9ebffd93 · Brandon Ballinger · The Android Open Source Project · b642d30b · c5bb4591 · 9ebffd93
Commit 9ebffd93 authored 15 years ago by Brandon Ballinger Committed by The Android Open Source Project 15 years ago
--- a/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -115,6 +115,7 @@ public class KeyboardSwitcher {
    void setKeyboardMode(int mode, int imeOptions, boolean isSymbols) {
        mMode = mode;
        mImeOptions = imeOptions;
+        mIsSymbols = isSymbols;
        mInputView.setPreviewEnabled(true);
        KeyboardId id = getKeyboardId(mode, imeOptions, isSymbols);
        LatinKeyboard keyboard = getKeyboard(id);
@@ -226,7 +227,6 @@ public class KeyboardSwitcher {
    }

    void toggleSymbols() {
-        mIsSymbols = !mIsSymbols;
-        setKeyboardMode(mMode, mImeOptions, mIsSymbols);
+        setKeyboardMode(mMode, mImeOptions, !mIsSymbols);
    }
 }