From b212cbaca3051d239c95e329380047ced0ff9632 Mon Sep 17 00:00:00 2001 From: Vaibhav Devmurari Date: Thu, 28 Apr 2022 10:20:08 +0000 Subject: Shift RoundedCornerOverlay to Display window hierarchy ScreenDecorations use rounded corner overlay flag and are currently drawn outside of the window hierarchy, It currently blocking touches to the gesture monitor spy windows. By bringing them to Display content Surface control, we make them in the same tree as the gesture monitor. And since gesture monitor window are hugher in z ordering they will take precedence for touch events over ScreenDecorations. Test: manual Bug: 225505986 Change-Id: If60450c5e6f29c23a96ce8a89a5ba7d47ee8609d (cherry picked from commit ef6a5e48d01ef090bd721bae6feec3f909f5ac7f) --- services/core/java/com/android/server/wm/WindowToken.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index d2e56faa0914..ed9b2f072bff 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -378,7 +378,7 @@ class WindowToken extends WindowContainer { SurfaceControl.Builder makeSurface() { final SurfaceControl.Builder builder = super.makeSurface(); if (mRoundedCornerOverlay) { - builder.setParent(null); + builder.setParent(getDisplayContent().getSurfaceControl()); } return builder; } -- cgit v1.2.3-59-g8ed1b