openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
TreeHugger Robot 2021-11-09 01:35:48 +00:00 committed by Android (Google) Code Review
parent 1c79327f6e beefd1890c
commit ef18f8c5a2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
View File

@ -153,10 +153,8 @@ public class ProgressDelegateInputConsumer implements InputConsumer,
ObjectAnimator anim = mProgress.animateToValue(endValue); ObjectAnimator anim = mProgress.animateToValue(endValue);
anim.setDuration(duration).setInterpolator(scrollInterpolatorForVelocity(velocity)); anim.setDuration(duration).setInterpolator(scrollInterpolatorForVelocity(velocity));
if (mRecentsAnimationController != null) { anim.addListener(AnimatorListeners.forSuccessCallback(
anim.addListener(AnimatorListeners.forSuccessCallback( () -> mStateCallback.setState(STATE_FLING_FINISHED)));
() -> mStateCallback.setState(STATE_FLING_FINISHED)));
}
anim.start(); anim.start();
} }

3
quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
View File

@ -136,6 +136,9 @@ public class AllSetActivity extends Activity {
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
clearBinderOverride(); clearBinderOverride();
if (mSwipeProgress.value >= 1) {
finishAndRemoveTask();
}
} }
private void clearBinderOverride() { private void clearBinderOverride() {