| commit | 01d3eb5408da9bd4e2c3dac86576a8ccf7d0769e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat May 07 16:50:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 07 16:50:30 2022 +0000 |
| tree | 7851af40bb872310f26657d9982b675ea14bd395 | |
| parent | ddd8027e573a555e84879428e1ecad5c1df88d57 [diff] | |
| parent | 891694abd4b87d5201bf3f13c35edead387a52ee [diff] |
Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21 am: 891694abd4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384 Change-Id: I1e9022ea7cecadb2fcc1e0939c55555c424cd1c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index 138fb99..2be1179 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -372,6 +372,7 @@ // If we're already animating to the value, just leave it be instead of restarting it. if (!mIconAlignmentForLauncherState.isAnimatingToValue(toAlignment)) { + mIconAlignmentForLauncherState.finishAnimation(); animatorSet.play(mIconAlignmentForLauncherState.animateToValue(toAlignment) .setDuration(duration)); }