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

Merge "Use task layer constants for window decor z-order" into tm-qpr-dev

Browse Source
This commit is contained in:
Garfield Tan
2022-12-14 21:18:55 +00:00
committed by Android (Google) Code Review
parent 554101125f e88a3d3797
commit a6160ee015
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java
View File

@@ -33,6 +33,7 @@ import android.view.View;
import android.view.ViewRootImpl; import android.view.ViewRootImpl;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowlessWindowManager; import android.view.WindowlessWindowManager;
import android.window.TaskConstants;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTaskOrganizer;
@@ -195,7 +196,9 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
.setParent(mTaskSurface) .setParent(mTaskSurface)
.build(); .build();
startT.setTrustedOverlay(mDecorationContainerSurface, true); startT.setTrustedOverlay(mDecorationContainerSurface, true)
.setLayer(mDecorationContainerSurface,
TaskConstants.TASK_CHILD_LAYER_WINDOW_DECORATIONS);
} }
final Rect taskBounds = taskConfig.windowConfiguration.getBounds(); final Rect taskBounds = taskConfig.windowConfiguration.getBounds();
@@ -213,8 +216,6 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
outResult.mDecorContainerOffsetX, outResult.mDecorContainerOffsetY) outResult.mDecorContainerOffsetX, outResult.mDecorContainerOffsetY)
.setWindowCrop(mDecorationContainerSurface, .setWindowCrop(mDecorationContainerSurface,
outResult.mWidth, outResult.mHeight) outResult.mWidth, outResult.mHeight)
// TODO(b/244455401): Change the z-order when it's better organized
.setLayer(mDecorationContainerSurface, mTaskInfo.numActivities + 1)
.show(mDecorationContainerSurface); .show(mDecorationContainerSurface);
// TaskBackgroundSurface // TaskBackgroundSurface
@@ -225,6 +226,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
.setEffectLayer() .setEffectLayer()
.setParent(mTaskSurface) .setParent(mTaskSurface)
.build(); .build();
startT.setLayer(mTaskBackgroundSurface, TaskConstants.TASK_CHILD_LAYER_TASK_BACKGROUND);
} }
float shadowRadius = loadDimension(resources, params.mShadowRadiusId); float shadowRadius = loadDimension(resources, params.mShadowRadiusId);
@@ -236,8 +239,6 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
taskBounds.height()) taskBounds.height())
.setShadowRadius(mTaskBackgroundSurface, shadowRadius) .setShadowRadius(mTaskBackgroundSurface, shadowRadius)
.setColor(mTaskBackgroundSurface, mTmpColor) .setColor(mTaskBackgroundSurface, mTmpColor)
// TODO(b/244455401): Change the z-order when it's better organized
.setLayer(mTaskBackgroundSurface, -1)
.show(mTaskBackgroundSurface); .show(mTaskBackgroundSurface);
// CaptionContainerSurface, CaptionWindowManager // CaptionContainerSurface, CaptionWindowManager