Merge "Revert "Shift RoundedCornerOverlay to Display window hierarchy"" into tm-dev am: 0e2cc380d3 am: cb2aabc948

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

Change-Id: I0791be9e5ad9ed2802ca38c6bec723d7423b4b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Wang
2022-05-19 08:38:59 +00:00
committed by Automerger Merge Worker

View File

@@ -379,7 +379,7 @@ class WindowToken extends WindowContainer<WindowState> {
SurfaceControl.Builder makeSurface() {
final SurfaceControl.Builder builder = super.makeSurface();
if (mRoundedCornerOverlay) {
builder.setParent(getDisplayContent().getSurfaceControl());
builder.setParent(null);
}
return builder;
}