Remove direct calls of setKeyboardXXX from KeyboardSwitcher

These calls, setAlphabetKeyboard, setSymbolsKeyboard, and
setSymbolsShiftedKeyboard have to be call backed from KeyboardState.

Bug: 5708602
Change-Id: Ibbe1a21bd10bf942e17886869c0ab0fa1735b87e

1 files changed, 6 insertions, 31 deletions

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 734189689..6686de047 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -163,7 +163,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
         mKeyboardView.setKeyboard(keyboard);
         mCurrentInputView.setKeyboardGeometry(keyboard.mTopPadding);
         mCurrentId = keyboard.mId;
-        mState.onSetKeyboard(isAlphabetMode());
         updateShiftLockState(keyboard);
         mKeyboardView.setKeyPreviewPopupEnabled(
                 Settings.Values.isKeyPreviewPopupEnabled(mPrefs, mResources),
@@ -361,15 +360,7 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
         if (DEBUG_STATE) {
             Log.d(TAG, "toggleShift: " + mState);
         }
-        if (isAlphabetMode()) {
-            setShifted(mState.isShiftedOrShiftLocked() ? UNSHIFT : MANUAL_SHIFT);
-        } else {
-            if (isSymbolShifted()) {
-                setSymbolsKeyboard();
-            } else {
-                setSymbolsShiftedKeyboard();
-            }
-        }
+        mState.onToggleShift(isAlphabetMode(), isSymbolShifted());
     }
 
     /**
@@ -379,31 +370,17 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
         if (DEBUG_STATE) {
             Log.d(TAG, "toggleCapsLock: " + mState);
         }
-        if (isAlphabetMode()) {
-            if (mState.isShiftLocked()) {
-                setShiftLocked(false);
-                // TODO: Remove this.
-                // Shift key is long pressed while caps lock state, we will toggle back to normal
-                // state. And mark as if shift key is released.
-                mState.onReleaseCapsLock();
-            } else {
-                setShiftLocked(true);
-            }
-        }
+        mState.onToggleCapsLock(isAlphabetMode());
     }
 
     /**
-     * Toggle keyboard mode triggered by user touch event.
+     * Toggle between alphabet and symbols modes triggered by user touch event.
      */
-    public void toggleKeyboardMode() {
+    public void toggleAlphabetAndSymbols() {
         if (DEBUG_STATE) {
-            Log.d(TAG, "toggleKeyboardMode: " + mState);
-        }
-        if (isAlphabetMode()) {
-            setSymbolsKeyboard();
-        } else {
-            setAlphabetKeyboard();
+            Log.d(TAG, "toggleAlphabetAndSymbols: " + mState);
         }
+        mState.onToggleAlphabetAndSymbols(isAlphabetMode());
     }
 
     /**
@@ -463,7 +440,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
     // Implements {@link KeyboardState.SwitchActions}.
     @Override
     public void setSymbolsKeyboard() {
-        mState.onSaveShiftLockState();
         setKeyboard(getKeyboard(mSymbolsKeyboardId));
     }
 
@@ -471,7 +447,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
     @Override
     public void setAlphabetKeyboard() {
         setKeyboard(getKeyboard(mMainKeyboardId));
-        mState.onRestoreShiftLockState();
     }
 
     // TODO: Remove this method