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

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

Merge "Remove unnecessary variables"

parents 342ea3d3 0d9d37ce

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

+2 −6
Original line number Diff line number Diff line
@@ -127,9 +127,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke 
        private static final int MSG_TYPING_STATE_EXPIRED = 4;



        private final KeyTimerParams mParams;

        // TODO: Suppress layout changes in key repeat mode

        // TODO: Remove this variable.

        private boolean mInKeyRepeat;



        public KeyTimerHandler(LatinKeyboardView outerInstance, KeyTimerParams params) {

            super(outerInstance);
@@ -165,7 +162,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke 
        private void startKeyRepeatTimer(PointerTracker tracker, long delay) {

            final Key key = tracker.getKey();

            if (key == null) return;

            mInKeyRepeat = true;

            sendMessageDelayed(obtainMessage(MSG_REPEAT_KEY, key.mCode, 0, tracker), delay);

        }
@@ -175,12 +171,12 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke 
        }



        public void cancelKeyRepeatTimer() {

            mInKeyRepeat = false;

            removeMessages(MSG_REPEAT_KEY);

        }



        // TODO: Suppress layout changes in key repeat mode

        public boolean isInKeyRepeat() {

            return mInKeyRepeat;

            return hasMessages(MSG_REPEAT_KEY);

        }



        @Override

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

+1 −9
Original line number Diff line number Diff line
@@ -148,10 +148,6 @@ public class PointerTracker { 
    // true if this pointer has been long-pressed and is showing a more keys panel.

    private boolean mIsShowingMoreKeysPanel;



    // TODO: Remove this variable.

    // true if this pointer is repeatable key

    private boolean mIsRepeatableKey;



    // true if this pointer is in sliding key input

    boolean mIsInSlidingKeyInput;
@@ -529,7 +525,6 @@ public class PointerTracker { 
                || mKeyDetector.alwaysAllowsSlidingInput();

        mKeyboardLayoutHasBeenChanged = false;

        mKeyAlreadyProcessed = false;

        mIsRepeatableKey = false;

        mIsInSlidingKeyInput = false;

        mIgnoreModifierKey = false;

        if (key != null) {
@@ -676,7 +671,7 @@ public class PointerTracker { 
        }

        if (mKeyAlreadyProcessed)

            return;

        if (!mIsRepeatableKey) {

        if (mCurrentKey != null && !mCurrentKey.isRepeatable()) {

            detectAndSendKey(mCurrentKey, mKeyX, mKeyY);

        }

    }
@@ -722,9 +717,6 @@ public class PointerTracker { 
        if (key != null && key.isRepeatable()) {

            onRegisterKey(key);

            mTimerProxy.startKeyRepeatTimer(this);

            mIsRepeatableKey = true;

        } else {

            mIsRepeatableKey = false;

        }

    }