Merge "Shift RoundedCornerOverlay to Display window hierarchy" into tm-dev am: b5863e8d6c am: 81607ac6da

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

Change-Id: Id1b7112cc36653bfff64862e14726f3f7686bc82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vaibhav Devmurari
2022-05-06 15:56:56 +00:00
committed by Automerger Merge Worker

View File

@@ -379,7 +379,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(null); builder.setParent(getDisplayContent().getSurfaceControl());
} }
return builder; return builder;
} }