Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e5e5645 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Call FallbackRecentsView#init() before setContentView()" into main

parents 1cb02701 aeecb1e8

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

+12 −7
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.launcher3.InvariantDeviceProfile; 
import com.android.launcher3.LauncherAnimationRunner;

import com.android.launcher3.LauncherAnimationRunner.AnimationResult;

import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;

import com.android.launcher3.LauncherRootView;

import com.android.launcher3.R;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.PendingAnimation;
@@ -139,14 +140,14 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem 
                        null /* depthController */, getStatsLogManager(),

                        systemUiProxy, RecentsModel.INSTANCE.get(this),

                        null /*activityBackCallback*/);

        // Setup root and child views

        inflateRootView(R.layout.fallback_recents_activity);

        setContentView(getRootView());

        mDragLayer = findViewById(R.id.drag_layer);

        mScrimView = findViewById(R.id.scrim_view);

        mFallbackRecentsView = findViewById(R.id.overview_panel);

        mActionsView = findViewById(R.id.overview_actions_view);

        getRootView().getSysUiScrim().getSysUIProgress().updateValue(0);

        mDragLayer.recreateControllers();

        LauncherRootView rootView = getRootView();

        mDragLayer = rootView.findViewById(R.id.drag_layer);

        mScrimView = rootView.findViewById(R.id.scrim_view);

        mFallbackRecentsView = rootView.findViewById(R.id.overview_panel);

        mActionsView = rootView.findViewById(R.id.overview_actions_view);



        if (DESKTOP_WINDOWING_MODE.isEnabled(this)) {

            mDesktopRecentsTransitionController = new DesktopRecentsTransitionController(

                    getStateManager(), systemUiProxy, getIApplicationThread(),
@@ -156,6 +157,10 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem 
        mFallbackRecentsView.init(mActionsView, mSplitSelectStateController,

                mDesktopRecentsTransitionController);



        setContentView(rootView);

        rootView.getSysUiScrim().getSysUIProgress().updateValue(0);

        mDragLayer.recreateControllers();



        mTISBindHelper = new TISBindHelper(this, this::onTISConnected);

    }