commit beefd1890cc1cde95750c70b095ecf91dccc4a73
author Sunny Goyal <sunnygoyal@google.com> Fri Nov 05 13:04:30 2021 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Nov 05 13:05:49 2021 -0700
tree 2c15ac5d9c5675e8980b842a35b34725ca98c07f
parent d71a4288cf13ea6aedd1d02dc82e844767c1d1f5

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

quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
index c69b510..9304dbf 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
@@ -151,10 +151,8 @@
 
         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();
     }
 

quickstep/src/com/android/quickstep/interaction/AllSetActivity.java

diff --git a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
index 272a9a1..965c1bc 100644
--- a/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+++ b/quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
@@ -136,6 +136,9 @@
     protected void onPause() {
         super.onPause();
         clearBinderOverride();
+        if (mSwipeProgress.value >= 1) {
+            finishAndRemoveTask();
+        }
     }
 
     private void clearBinderOverride() {