| commit | aebd373465244c139f110dadcfcf6bcc64c82d3d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat May 07 16:26:18 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 07 16:26:18 2022 +0000 |
| tree | 5aa2300ffcbf72833921cf831f8af524c6ffd84e | |
| parent | 90bacbec2c6c69fa5593c8794cf3e54098a97da5 [diff] | |
| parent | 235de12d1f60a72dc520f36dc8383df24d881311 [diff] |
Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 235de12d1f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384 Change-Id: If264111747c6bde581e4fe7f017af984a791d89a 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)); }