commit cb207ef236d6f1fb91ac3793d5ea1c3be6c121cc
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 18 01:34:37 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 18 01:34:37 2021 +0000
tree 73187dbe6f8d818a19327ca0e8e26b836fdc15e8
parent f700cab0312a74f0c6df6302c27990bba5896445
parent deec62378c7e3518d1b8a727880b9c68efafae09

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

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