commit ef11d1d2ade2f159144987e0cccc8b6d58a0f863
author Tony Wickham <twickham@google.com> Wed Mar 10 23:52:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 10 23:52:59 2021 +0000
tree 5a64bf6bc3c11bbae84301d1443e22019e447869
parent 602f9797a638ad8a34e5e8642a6ec7d4fd7538cb
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: Ic063e621d6fdbca7777c9a33a3d554cff35dbcaa

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() {