commit 4276ee4897f59cfb1a2e432adfe54196b1a0dd2d
author Vinit Nayak <peanutbutter@google.com> Wed Jul 03 13:24:52 2024 -0700
committer Vinit Nayak <peanutbutter@google.com> Wed Jul 03 22:18:05 2024 +0000
tree e8828e946d6d3f8eaa267e4c0349bf7f2769ae3a
parent 98d80946889494b68464e57301c6527461861c8a

Initialize SplitSelectStateController for 3P before setting content view

* RecentsView#onAttachedToWindow relies on splitSelectStateController
being initialized, so we now do it before RecentsActivity calls
setContentView()

Bug: 332643607
Test: Couldn't repro before or after :(
Flag: EXEMPT bugfix
Change-Id: Ic26460e08ca74adcf6dcf31abc956ad57f4061c2

quickstep/src/com/android/quickstep/RecentsActivity.java

diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 13e9844..18461a6 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -132,6 +132,13 @@
      * Init drag layer and overview panel views.
      */
     protected void setupViews() {
+        SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(this);
+        // SplitSelectStateController needs to be created before setContentView()
+        mSplitSelectStateController =
+                new SplitSelectStateController(this, mHandler, getStateManager(),
+                        null /* depthController */, getStatsLogManager(),
+                        systemUiProxy, RecentsModel.INSTANCE.get(this),
+                        null /*activityBackCallback*/);
         inflateRootView(R.layout.fallback_recents_activity);
         setContentView(getRootView());
         mDragLayer = findViewById(R.id.drag_layer);
@@ -139,12 +146,6 @@
         mFallbackRecentsView = findViewById(R.id.overview_panel);
         mActionsView = findViewById(R.id.overview_actions_view);
         getRootView().getSysUiScrim().getSysUIProgress().updateValue(0);
-        SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(this);
-        mSplitSelectStateController =
-                new SplitSelectStateController(this, mHandler, getStateManager(),
-                        null /* depthController */, getStatsLogManager(),
-                        systemUiProxy, RecentsModel.INSTANCE.get(this),
-                        null /*activityBackCallback*/);
         mDragLayer.recreateControllers();
         if (enableDesktopWindowingMode()) {
             mDesktopRecentsTransitionController = new DesktopRecentsTransitionController(