commit 0923bd5b2a2d5d500aaa06d132f496452945eac5
author Tony Wickham <twickham@google.com> Thu Mar 11 01:39:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 11 01:39:00 2021 +0000
tree 5a64bf6bc3c11bbae84301d1443e22019e447869
parent 134812c3cb5cbf83f9b49efcf54855f94c8d18c0
parent 4c26664d847e9f026951724a7a1c2453d413432c

Merge "End Taskbar animator before other cleanup" into sc-dev am: 4c26664d84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4b779d2cdacc31739a21d8e3bb25fb2819a3493

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
index 544835c..fb7d85f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java
@@ -246,6 +246,11 @@
      * Removes the Taskbar from the screen, and removes any obsolete listeners etc.
      */
     public void cleanup() {
+        if (mAnimator != null) {
+            // End this first, in case it relies on properties that are about to be cleaned up.
+            mAnimator.end();
+        }
+
         mTaskbarView.cleanup();
         mTaskbarContainerView.cleanup();
         removeFromWindowManager();
@@ -253,10 +258,6 @@
         mTaskbarVisibilityController.cleanup();
         mHotseatController.cleanup();
         mRecentsController.cleanup();
-
-        if (mAnimator != null) {
-            mAnimator.end();
-        }
     }
 
     private void removeFromWindowManager() {