Merge "Remove KeyboardStart.isInMomentarySwitchState"

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

@@ -335,10 +335,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
         }
     }
 
-    public boolean isInMomentarySwitchState() {
-        return mState.isInMomentarySwitchState();
-    }
-
     /**
      * Updates state machine to figure out when to automatically switch back to the previous mode.
      */

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

@@ -315,9 +315,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
             default:
                 final int longpressTimeout =
                         Settings.getInstance().getCurrent().mKeyLongpressTimeout;
-                if (KeyboardSwitcher.getInstance().isInMomentarySwitchState()) {
+                if (tracker.isInSlidingKeyInputFromModifier()) {
-                    // We use longer timeout for sliding finger input started from the symbols
+                    // We use longer timeout for sliding finger input started from the modifier key.
-                    // mode key.
                     delay = longpressTimeout * 3;
                 } else {
                     delay = longpressTimeout;

java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java

@@ -574,11 +574,6 @@ public final class KeyboardState {
         }
     }
 
-    public boolean isInMomentarySwitchState() {
-        return mSwitchState == SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL
-                || mSwitchState == SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE;
-    }
-
     private static boolean isSpaceCharacter(final int c) {
         return c == Constants.CODE_SPACE || c == Constants.CODE_ENTER;
     }