From 78357f79798f235008c9318a6df4776921f2d758 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Fri, 6 May 2022 17:34:07 +0100
Subject: [PATCH] Finish mIconAlignmentForLauncherState animation before
 animating to new value

Fix: 230630665
Test: Launch app and return home, taskbar animation should be smooth
Change-Id: Ie6c7daac7f185a51476a9d076dde628d57ff77eb
---
 .../launcher3/taskbar/TaskbarLauncherStateController.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index 138fb991f4..2be1179c3f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -372,6 +372,7 @@ import java.util.function.Supplier;
 
         // 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));
         }