PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean-up unnecessary desktop windowing flag usage" into main

Browse Source
This commit is contained in:
Alex Chau
2024-04-04 14:04:49 +00:00
committed by Android (Google) Code Review
parent ce01b91f41 13b7ceeff0
commit 2bf1143079
15 changed files with 67 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+10 -11
View File
@@ -216,7 +216,7 @@ public class QuickstepLauncher extends Launcher {
private FixedContainerItems mAllAppsPredictions;
private HotseatPredictionController mHotseatPredictionController;
private DepthController mDepthController;
private DesktopVisibilityController mDesktopVisibilityController;
private @Nullable DesktopVisibilityController mDesktopVisibilityController;
private QuickstepTransitionManager mAppTransitionManager;
private OverviewActionsView mActionsView;
private TISBindHelper mTISBindHelper;
@@ -276,8 +276,8 @@ public class QuickstepLauncher extends Launcher {
mTISBindHelper = new TISBindHelper(this, this::onTISConnected);
mDepthController = new DepthController(this);
mDesktopVisibilityController = new DesktopVisibilityController(this);
if (enableDesktopWindowingMode()) {
mDesktopVisibilityController = new DesktopVisibilityController(this);
mDesktopVisibilityController.registerSystemUiListener();
mSplitSelectStateController.initSplitFromDesktopController(this);
}
@@ -936,15 +936,13 @@ public class QuickstepLauncher extends Launcher {
@Override
public void setResumed() {
if (enableDesktopWindowingMode()) {
DesktopVisibilityController controller = mDesktopVisibilityController;
if (controller != null && controller.areFreeformTasksVisible()
&& !controller.isRecentsGestureInProgress()) {
// Return early to skip setting activity to appear as resumed
// TODO(b/255649902): shouldn't be needed when we have a separate launcher state
// for desktop that we can use to control other parts of launcher
return;
}
if (mDesktopVisibilityController != null
&& mDesktopVisibilityController.areFreeformTasksVisible()
&& !mDesktopVisibilityController.isRecentsGestureInProgress()) {
// Return early to skip setting activity to appear as resumed
// TODO(b/255649902): shouldn't be needed when we have a separate launcher state
// for desktop that we can use to control other parts of launcher
return;
}
super.setResumed();
}
@@ -1078,6 +1076,7 @@ public class QuickstepLauncher extends Launcher {
return mDepthController;
}
@Nullable
public DesktopVisibilityController getDesktopVisibilityController() {
return mDesktopVisibilityController;
}