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

Merge "Revert "Avoid changing z-order of overlay layer after resizing display"" into udc-qpr-dev am: e7dbfa3235

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23897510

Change-Id: I30bf207292743eb4660d4e661b17e694d18efbcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-05 16:56:16 +00:00
committed by Automerger Merge Worker
parent 3889d0a12e e7dbfa3235
commit 487a61beb1
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Transition.java
View File

@@ -2270,7 +2270,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
// transitions anyways). // transitions anyways).
return wc.getParent().asDisplayContent().getWindowingLayer(); return wc.getParent().asDisplayContent().getWindowingLayer();
} }
return wc.getParentSurfaceControl(); return wc.getParent().getSurfaceControl();
} }
/** /**

11
services/core/java/com/android/server/wm/WindowToken.java
View File

@@ -388,23 +388,12 @@ class WindowToken extends WindowContainer<WindowState> {
@Override @Override
SurfaceControl.Builder makeSurface() { SurfaceControl.Builder makeSurface() {
final SurfaceControl.Builder builder = super.makeSurface(); final SurfaceControl.Builder builder = super.makeSurface();
// The overlay may use COLOR_MODE_A8 that needs to be at the top of the display to avoid
// additional memory usage, see b/235601833. Note that getParentSurfaceControl() must use
// the same parent.
if (mRoundedCornerOverlay) { if (mRoundedCornerOverlay) {
builder.setParent(null); builder.setParent(null);
} }
return builder; return builder;
} }
@Override
public SurfaceControl getParentSurfaceControl() {
if (mRoundedCornerOverlay) {
return null;
}
return super.getParentSurfaceControl();
}
boolean isClientVisible() { boolean isClientVisible() {
return mClientVisible; return mClientVisible;
} }