Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not create window decorations for split roots" into udc-dev

Browse Source
This commit is contained in:
Jorge Gil
2023-05-09 00:22:00 +00:00
committed by Android (Google) Code Review
parent 6ddd968181 1bd14bc4e3
commit 782fc415b9
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -337,6 +337,11 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
return isTaskInSplitScreen(taskId) && isSplitScreenVisible(); return isTaskInSplitScreen(taskId) && isSplitScreenVisible();
} }
/** Check whether the task is the single-top root or the root of one of the stages. */
public boolean isTaskRootOrStageRoot(int taskId) {
return mStageCoordinator.isRootOrStageRoot(taskId);
}
public @SplitPosition int getSplitPosition(int taskId) { public @SplitPosition int getSplitPosition(int taskId) {
return mStageCoordinator.getSplitPosition(taskId); return mStageCoordinator.getSplitPosition(taskId);
} }

7
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -377,6 +377,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
return STAGE_TYPE_UNDEFINED; return STAGE_TYPE_UNDEFINED;
} }
boolean isRootOrStageRoot(int taskId) {
if (mRootTaskInfo != null && mRootTaskInfo.taskId == taskId) {
return true;
}
return mMainStage.isRootTaskId(taskId) || mSideStage.isRootTaskId(taskId);
}
boolean moveToStage(ActivityManager.RunningTaskInfo task, @SplitPosition int stagePosition, boolean moveToStage(ActivityManager.RunningTaskInfo task, @SplitPosition int stagePosition,
WindowContainerTransaction wct) { WindowContainerTransaction wct) {
prepareEnterSplitScreen(wct, task, stagePosition); prepareEnterSplitScreen(wct, task, stagePosition);

4
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
View File

@@ -286,6 +286,10 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
} }
} }
boolean isRootTaskId(int taskId) {
return mRootTaskInfo != null && mRootTaskInfo.taskId == taskId;
}
void onResizing(Rect newBounds, Rect sideBounds, SurfaceControl.Transaction t, int offsetX, void onResizing(Rect newBounds, Rect sideBounds, SurfaceControl.Transaction t, int offsetX,
int offsetY, boolean immediately) { int offsetY, boolean immediately) {
if (mSplitDecorManager != null && mRootTaskInfo != null) { if (mSplitDecorManager != null && mRootTaskInfo != null) {

4
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
View File

@@ -760,6 +760,10 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
private boolean shouldShowWindowDecor(RunningTaskInfo taskInfo) { private boolean shouldShowWindowDecor(RunningTaskInfo taskInfo) {
if (taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) return true; if (taskInfo.getWindowingMode() == WINDOWING_MODE_FREEFORM) return true;
if (mSplitScreenController.isPresent()
&& mSplitScreenController.get().isTaskRootOrStageRoot(taskInfo.taskId)) {
return false;
}
return DesktopModeStatus.isProto2Enabled() return DesktopModeStatus.isProto2Enabled()
&& taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD && taskInfo.getActivityType() == ACTIVITY_TYPE_STANDARD
&& mDisplayController.getDisplayContext(taskInfo.displayId) && mDisplayController.getDisplayContext(taskInfo.displayId)