Merge "Fixing allSet page not closed if recentsAnimation takes time to start" into sc-v2-dev am: ef18f8c5a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16200930

Change-Id: Ie168c6b5d955b9839f6d48b3204d9f62ed67cd90
This commit is contained in:
TreeHugger Robot
2021-11-09 01:57:46 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 4 deletions
@@ -153,10 +153,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();
}
@@ -136,6 +136,9 @@ public class AllSetActivity extends Activity {
protected void onPause() {
super.onPause();
clearBinderOverride();
if (mSwipeProgress.value >= 1) {
finishAndRemoveTask();
}
}
private void clearBinderOverride() {