commit fcd4a6b131a6f6ae3bb81deb786ed3d78843bd3f
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 18 01:35:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 18 01:35:07 2021 +0000
tree 272bd25f90c542af63288efe3dfde3771f856e0f
parent 47c7f8acaaa5dc742a048d64ec412ac8b7cb13f5
parent cb207ef236d6f1fb91ac3793d5ea1c3be6c121cc

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

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

Change-Id: I001a9801f8cbf02bbb1e85d35b33e50b20a07315

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);