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

This commit is contained in:
Winson Chung
2022-09-23 04:33:22 +00:00
committed by Android (Google) Code Review

View File

@@ -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(