aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call FallbackRecentsView#init() before setContentView()

Browse Source 
* Init sets mSplitSelectStateController which RecentsView
then uses in onAttachedToWindow(). That needs to be set
before it gets attached to the window, which happens in
RecentsActivity#setContentView()

Fixes: 332643607
Test: Only presubmit, issue not reproducible
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aeecb1e8a5cabe9fc58af69f7b47764a96a08d76)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eac1d34438209f266212b1bbe8c9704c2947dbcd)
Merged-In: Icc555cad17b734e2a9c035991c19bbdc6b02de5d
Change-Id: Icc555cad17b734e2a9c035991c19bbdc6b02de5d
This commit is contained in:
Vinit Nayak
2024-07-29 16:28:04 -07:00
committed by Android Build Coastguard Worker
parent c9091b8c51
commit 4b9ae54e1c
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
quickstep/src/com/android/quickstep/RecentsActivity.java
View File

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