commit a78260e5964cd3d55aa1c4c5442595181d29a276
author Sunny Goyal <sunnygoyal@google.com> Fri Mar 19 17:21:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 19 17:21:24 2021 +0000
tree bc8a7450fae88f7d09ee09d3b547e2fd9a5ca798
parent f3317369b5180fa15ee18ee80887e40db81fbc18
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: If23e24765d249cb42cb5e1890cd9a1a21e17466b

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