Merge "ScreenDecor: Set touchable region in windows coordinate space" into pi-dev am: befd06af14

am: da87a31e2a Change-Id: I7f6226a2b329b791a76d540420e8a5c7a2521a21
2018-05-16 10:46:36 -07:00
parent 39e3d378d7 da87a31e2a
commit 71c4f677af
1 changed files with 12 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
+++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
@@ -554,7 +554,18 @@ public class ScreenDecorations extends SystemUI implements Tunable {
                return null;
            }

-            return mInfo.displayCutout.getBounds();
+            View rootView = getRootView();
+            Region cutoutBounds = mInfo.displayCutout.getBounds();
+
+            // Transform to window's coordinate space
+            rootView.getLocationOnScreen(mLocation);
+            cutoutBounds.translate(-mLocation[0], -mLocation[1]);
+
+            // Intersect with window's frame
+            cutoutBounds.op(rootView.getLeft(), rootView.getTop(), rootView.getRight(),
+                    rootView.getBottom(), Region.Op.INTERSECT);
+
+            return cutoutBounds;
        }
    }
 }