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

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

Merge "Don't cancel long press timer too early" into jb-mr1-dev

parents 7c8f4a04 c9ba2699

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

+1 −3
Original line number Diff line number Diff line
@@ -836,13 +836,11 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
            // Register move event on gesture tracker.

            onGestureMoveEvent(x, y, eventTime, true /* isMajorEvent */, key);

            if (sInGesture) {

                mTimerProxy.cancelLongPressTimer();

                mCurrentKey = null;

                setReleasedKeyGraphics(oldKey);

                return;

            }

            if (mGestureStrokeWithPreviewPoints.hasDetectedFastMove()) {

                mTimerProxy.cancelLongPressTimer();

            }

        }



        if (key != null) {

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

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ public class GestureStroke { 
        mLastMajorEventY = y;

    }



    public final boolean hasDetectedFastMove() {

    private final boolean hasDetectedFastMove() {

        return mDetectFastMoveTime > 0;

    }