commit 06292bf2893cd77cc5b60010b4d6dddcecbe4b7f
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 18 01:57:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 18 01:57:12 2021 +0000
tree 42045b9b74b65969e5d8345d34e4138d278ea9e1
parent 8546c93309be160552bccc3561899b2b043afe77
parent fcd4a6b131a6f6ae3bb81deb786ed3d78843bd3f

Merge "Fixing Taskbar not initialized properly on recreate" into sc-v2-dev am: cb207ef236 am: fcd4a6b131

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15019036

Change-Id: I56454821c074a01871452072f22c2c5e852c1f8d

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index 255ba1e..7d0afe1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -90,12 +90,17 @@
         mHotseatController.init();
         mLauncher.setTaskbarUIController(this);
         mKeyguardController = taskbarControllers.taskbarKeyguardController;
+
         onLauncherResumedOrPaused(mLauncher.hasBeenResumed());
         mIconAlignmentForResumedState.finishAnimation();
+        onIconAlignmentRatioChanged();
     }
 
     @Override
     protected void onDestroy() {
+        mIconAlignmentForResumedState.finishAnimation();
+        mIconAlignmentForGestureState.finishAnimation();
+
         mHotseatController.cleanup();
         setTaskbarViewVisible(true);
         mLauncher.getHotseat().setIconsAlpha(1f);