Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d77ae9d authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Remove KeyboardStart.isInMomentarySwitchState"

parents 07e56e76 e7e7b323

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

+0 −4
Original line number Diff line number Diff line
@@ -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

+2 −3
Original line number Diff line number Diff line
@@ -315,9 +315,8 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
            default:

                final int longpressTimeout =

                        Settings.getInstance().getCurrent().mKeyLongpressTimeout;

                if (KeyboardSwitcher.getInstance().isInMomentarySwitchState()) {

                    // We use longer timeout for sliding finger input started from the symbols

                    // mode key.

                if (tracker.isInSlidingKeyInputFromModifier()) {

                    // We use longer timeout for sliding finger input started from the modifier key.

                    delay = longpressTimeout * 3;

                } else {

                    delay = longpressTimeout;

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

+0 −5
Original line number Diff line number Diff line
@@ -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;

    }