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

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

Change-Id: I148ceca2965d44fe25aed1fede63ae4c079d25ca
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:27:42 +00:00
committed by Automerger Merge Worker

View File

@@ -378,7 +378,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;
}