Merge "Revert "Shift RoundedCornerOverlay to Display window hierarchy"" into tm-dev am: 0e2cc380d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18471174 Change-Id: I946f1ea9d9951bd6021f3aae3b67530203aa8047 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -378,7 +378,7 @@ class WindowToken extends WindowContainer<WindowState> {
|
|||||||
SurfaceControl.Builder makeSurface() {
|
SurfaceControl.Builder makeSurface() {
|
||||||
final SurfaceControl.Builder builder = super.makeSurface();
|
final SurfaceControl.Builder builder = super.makeSurface();
|
||||||
if (mRoundedCornerOverlay) {
|
if (mRoundedCornerOverlay) {
|
||||||
builder.setParent(getDisplayContent().getSurfaceControl());
|
builder.setParent(null);
|
||||||
}
|
}
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user