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

Commit d859a200 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix case of gesture being stuck when the Launcher is stopped... 

Merge "Revert "Fix case of gesture being stuck when the Launcher is stopped mid-gesture"" into tm-qpr-dev
parents 65e73ce5 8ae6b852

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+1 −8
Original line number Diff line number Diff line
@@ -1140,13 +1140,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            boolean isCancel) {

        long duration = MAX_SWIPE_DURATION;

        float currentShift = mCurrentShift.value;

        boolean recentsVisible = mRecentsView != null

                && (mRecentsView.getWindowVisibility() == View.VISIBLE);

        if (!recentsVisible) {

            // We've hit a case where Launcher is been stopped mid-gesture, in this case, force

            // a LAST_TASK end target

            isCancel = true;

        }

        final GestureEndTarget endTarget = calculateEndTarget(velocity, endVelocity,

                isFling, isCancel);

        // Set the state, but don't notify until the animation completes
@@ -1226,7 +1219,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


        // Let RecentsView handle the scrolling to the task, which we launch in startNewTask()

        // or resumeLastTask().

        if (recentsVisible) {

        if (mRecentsView != null) {

            ActiveGestureLog.INSTANCE.trackEvent(ActiveGestureErrorDetector.GestureEvent

                    .SET_ON_PAGE_TRANSITION_END_CALLBACK);

            mRecentsView.setOnPageTransitionEndCallback(