summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-08-08 21:26:17 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-08-08 21:26:17 (GMT)
commitc87bbeea6bc6c693af9bf8648cdd6f777c9a46e6 (patch)
tree6426daca6d0ad0ebf7245f5830570bc0922f9c23
parent72b4b224430f50a897bdbc1d2a805243bc032da7 (diff)
parenta50cf9772a57e0058ba36e742beb37da11b27a41 (diff)
downloadandroid_packages_apps_Trebuchet-c87bbeea6bc6c693af9bf8648cdd6f777c9a46e6.zip
android_packages_apps_Trebuchet-c87bbeea6bc6c693af9bf8648cdd6f777c9a46e6.tar.gz
android_packages_apps_Trebuchet-c87bbeea6bc6c693af9bf8648cdd6f777c9a46e6.tar.bz2
Merge cherrypicks of [9169765, 9170440, 9170173, 9170474, 9170250, 9170251, 9170252, 9170462, 9170463, 9170464, 9170264, 9170422, 9170465] into qt-release
Change-Id: Ibd56f04c2e465a1ddb728e0ef98a900069f5f5a1
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java11
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 ac7ba3f..476bb8f 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -1133,17 +1133,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;
}