| commit | e93ed69a30c30dcbc86ddbe96cbe088fabfedd59 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 09 02:22:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 09 02:22:22 2021 +0000 |
| tree | da84caa30fa856d990aa3438a746089f57646a6c | |
| parent | 7d72c5d34d895bc9acf8c597c853ecc26ba62b17 [diff] | |
| parent | ff75c4fe78cd89b139dc36a2ea77254d0354b6e1 [diff] |
Merge "Fixing allSet page not closed if recentsAnimation takes time to start" into sc-v2-dev am: ef18f8c5a2 am: ff75c4fe78 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16200930 Change-Id: Ia7eabd1f8317146eba56f47f16f40bb43c8a952e
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java index 033fd85..71dca66 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
@@ -153,10 +153,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(); }
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() {