diff options
author | Tony <twickham@google.com> | 2019-08-01 15:04:36 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-01 15:04:36 -0700 |
commit | 1d7e474c69a2aa3a63688465f3b318b0d022890e (patch) | |
tree | b6b5187dfccfbc610d09cfd5f50def9796be35c6 | |
parent | 1343f03e2ed6de99bbb952017e3c6266679513d8 (diff) | |
parent | 03c548901fb77d0a47bb46036d559968b65b2293 (diff) | |
download | android_packages_apps_Trebuchet-1d7e474c69a2aa3a63688465f3b318b0d022890e.tar.gz android_packages_apps_Trebuchet-1d7e474c69a2aa3a63688465f3b318b0d022890e.tar.bz2 android_packages_apps_Trebuchet-1d7e474c69a2aa3a63688465f3b318b0d022890e.zip |
Don't end launcher components anim early even if it does nothing
am: 03c548901f
Change-Id: Ifb228b935659e971facfd8d6bb4c56ab54424e68
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 11d1a2434..7a67a2a15 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -943,17 +943,16 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> } if (start == end || duration <= 0) { mLauncherTransitionController.dispatchSetInterpolator(t -> end); - mLauncherTransitionController.getAnimationPlayer().end(); } else { mLauncherTransitionController.dispatchSetInterpolator(adjustedInterpolator); mAnimationFactory.adjustActivityControllerInterpolators(); - mLauncherTransitionController.getAnimationPlayer().setDuration(duration); + } + mLauncherTransitionController.getAnimationPlayer().setDuration(Math.max(0, duration)); - if (QUICKSTEP_SPRINGS.get()) { - mLauncherTransitionController.dispatchOnStartWithVelocity(end, velocityPxPerMs.y); - } - mLauncherTransitionController.getAnimationPlayer().start(); + if (QUICKSTEP_SPRINGS.get()) { + mLauncherTransitionController.dispatchOnStartWithVelocity(end, velocityPxPerMs.y); } + mLauncherTransitionController.getAnimationPlayer().start(); mHasLauncherTransitionControllerStarted = true; } |