| commit | 01dcde8ebdeaf843d9014ce6eee4460bd1af0929 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat May 07 16:26:45 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 07 16:26:45 2022 +0000 |
| tree | 562898231adeb9c4cb12704dd083851e154749e2 | |
| parent | 7710dcfbe33ccbc1092b4b1a7d5e18bf8b4f35ce [diff] | |
| parent | 0d37d70e21e7111d3fdadd6f0a2e426b15c66831 [diff] |
Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384 Change-Id: Ibd230253f0c2fcdd4a2ed2eeb9244b5d6b9742ef 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)); }