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

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

Merge "Don't cancel gesture typing while more keys keyboard is shown"

parents 8f5f79d7 8353e751

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

+5 −0
Original line number Diff line number Diff line
@@ -791,6 +791,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 


    private void cancelBatchInput() {

        sPointerTrackerQueue.cancelAllPointerTracker();

        mIsDetectingGesture = false;

        if (!sInGesture) {

            return;

        }
@@ -918,6 +919,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 
        if (mIsDetectingGesture) {

            final boolean onValidArea = mGestureStrokeWithPreviewPoints.addPointOnKeyboard(

                    x, y, gestureTime, isMajorEvent);

            // If the move event goes out from valid batch input area, cancel batch input.

            if (!onValidArea) {

                cancelBatchInput();

                return;
@@ -1196,6 +1198,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element { 


    @Override

    public void cancelTracking() {

        if (isShowingMoreKeysPanel()) {

            return;

        }

        mIsTrackingCanceled = true;

    }