Kill overscan insets and outsets
Test: Boots
Bug: 143255833
Change-Id: Ia939cae4524bcb8f27a27adfe4400a6b2c805061
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTestActivity.java b/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTestActivity.java
index 822d103..244beb0 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTestActivity.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTestActivity.java
@@ -17,8 +17,6 @@
package android.server.wm;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN;
-import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
@@ -49,7 +47,6 @@
"ExplicitSizeBottomRightGravity";
static final String TEST_EXPLICIT_SIZE_TOP_LEFT_GRAVITY = "ExplicitSizeTopLeftGravity";
static final String TEST_MATCH_PARENT = "MatchParent";
- static final String TEST_MATCH_PARENT_LAYOUT_IN_OVERSCAN = "MatchParentLayoutInOverscan";
static final String TEST_NO_FOCUS = "NoFocus";
static final String TEST_OVER_SIZED_DIMENSIONS = "OversizedDimensions";
static final String TEST_OVER_SIZED_DIMENSIONS_NO_LIMITS = "OversizedDimensionsNoLimits";
@@ -75,9 +72,6 @@
case TEST_MATCH_PARENT:
testMatchParent();
break;
- case TEST_MATCH_PARENT_LAYOUT_IN_OVERSCAN:
- testMatchParentLayoutInOverscan();
- break;
case TEST_EXPLICIT_SIZE:
testExplicitSize();
break;
@@ -132,15 +126,6 @@
});
}
- private void testMatchParentLayoutInOverscan() {
- doLayoutParamTest(params -> {
- params.width = MATCH_PARENT;
- params.height = MATCH_PARENT;
- params.flags |= FLAG_LAYOUT_IN_SCREEN;
- params.flags |= FLAG_LAYOUT_IN_OVERSCAN;
- });
- }
-
private void testExplicitSize() {
doLayoutParamTest(params -> {
params.width = 200;
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java b/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java
index 2b3abb3..52c8fee 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java
@@ -24,7 +24,6 @@
import static android.server.wm.DialogFrameTestActivity.TEST_EXPLICIT_SIZE_BOTTOM_RIGHT_GRAVITY;
import static android.server.wm.DialogFrameTestActivity.TEST_EXPLICIT_SIZE_TOP_LEFT_GRAVITY;
import static android.server.wm.DialogFrameTestActivity.TEST_MATCH_PARENT;
-import static android.server.wm.DialogFrameTestActivity.TEST_MATCH_PARENT_LAYOUT_IN_OVERSCAN;
import static android.server.wm.DialogFrameTestActivity.TEST_NO_FOCUS;
import static android.server.wm.DialogFrameTestActivity.TEST_OVER_SIZED_DIMENSIONS;
import static android.server.wm.DialogFrameTestActivity.TEST_OVER_SIZED_DIMENSIONS_NO_LIMITS;
@@ -103,20 +102,6 @@
);
}
- // If we have LAYOUT_IN_SCREEN and LAYOUT_IN_OVERSCAN with MATCH_PARENT,
- // we will not be constrained to the insets and so we will be the same size
- // as the main window main frame.
- // TODO: b/80262496
- // LAYOUT_IN_OVERSCAN isn't allowing windows to extend in to cutouts. We will have
- // to revisit whether to modify the behavior, or this test.
- @Ignore
- @Test
- public void testMatchParentDialogLayoutInOverscan() throws Exception {
- doParentChildTest(TEST_MATCH_PARENT_LAYOUT_IN_OVERSCAN, (parent, dialog) ->
- assertEquals(parent.getFrame(), dialog.getFrame())
- );
- }
-
private static final int explicitDimension = 200;
// The default gravity for dialogs should center them.
