commit 13698f220b3e9a90d71ade96caa9f06a33c77300
author Sunny Goyal <sunnygoyal@google.com> Fri Mar 19 17:20:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 19 17:20:25 2021 +0000
tree 589ad3d7647f46e938eb37eedfca921d917b58d0
parent c298e34c4139640f08991fb58f7ea8d14c855559
parent ddbc7bf03d51024ea16d569fc883f322cca9a0eb

Merge "Fixing ActivityInit getting called before the full launcher components are initialized" into sc-dev am: ddbc7bf03d

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

Change-Id: I2c779b1451345c25e13a7d7c3adf30b58ea576ea

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
index 20a645e..c4becf1 100644
--- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
@@ -95,9 +95,6 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mAppTransitionManager = new QuickstepTransitionManager(this);
-        mAppTransitionManager.registerRemoteAnimations();
-
         SysUINavigationMode.INSTANCE.get(this).addModeChangeListener(this);
         addMultiWindowModeChangedListener(mDepthController);
     }
@@ -225,6 +222,9 @@
         overviewPanel.init(mActionsView, splitPlaceholderView);
         mActionsView.updateVerticalMargin(SysUINavigationMode.getMode(this));
 
+        mAppTransitionManager = new QuickstepTransitionManager(this);
+        mAppTransitionManager.registerRemoteAnimations();
+
         addTaskbarIfNecessary();
         addOnDeviceProfileChangeListener(newDp -> addTaskbarIfNecessary());
     }