From beefd1890cc1cde95750c70b095ecf91dccc4a73 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Fri, 5 Nov 2021 13:04:30 -0700 Subject: [PATCH] Fixing allSet page not closed if recentsAnimation takes time to start > Also finishing the activity so that it doesn't show in home settings backstack Bug: 204541138 Test: Manual Change-Id: I7deec0d1ef7eec0464a0f21bf30b25cd5e18d02d --- .../inputconsumers/ProgressDelegateInputConsumer.java | 6 ++---- .../com/android/quickstep/interaction/AllSetActivity.java | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java index c69b510b43..9304dbf8d3 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java @@ -151,10 +151,8 @@ public class ProgressDelegateInputConsumer implements InputConsumer, ObjectAnimator anim = mProgress.animateToValue(endValue); anim.setDuration(duration).setInterpolator(scrollInterpolatorForVelocity(velocity)); - if (mRecentsAnimationController != null) { - anim.addListener(AnimatorListeners.forSuccessCallback( - () -> mStateCallback.setState(STATE_FLING_FINISHED))); - } + anim.addListener(AnimatorListeners.forSuccessCallback( + () -> mStateCallback.setState(STATE_FLING_FINISHED))); anim.start(); } diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java index 272a9a1009..965c1bcc32 100644 --- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java +++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java @@ -136,6 +136,9 @@ public class AllSetActivity extends Activity { protected void onPause() { super.onPause(); clearBinderOverride(); + if (mSwipeProgress.value >= 1) { + finishAndRemoveTask(); + } } private void clearBinderOverride() {