Fix cutout test in main
The test was cherrypicked from udc-layoutlib-native, but edge-to-edge is
enabled by default in main compared to udc. So the test cutout test has
to be adapted.
Flag: NONE layoutlib host only change
Bug: 74062470
Test: layoutlib tests
Change-Id: Ibee01ba2c31bbb9d5e98e55a8ee0bac0de391224
diff --git a/bridge/tests/res/testApp/MyApplication/golden/hole_cutout_edge_landscape.png b/bridge/tests/res/testApp/MyApplication/golden/hole_cutout_landscape.png
similarity index 100%
rename from bridge/tests/res/testApp/MyApplication/golden/hole_cutout_edge_landscape.png
rename to bridge/tests/res/testApp/MyApplication/golden/hole_cutout_landscape.png
Binary files differ
diff --git a/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java b/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
index 524e75c..23fe843 100644
--- a/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
+++ b/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderTests.java
@@ -2302,17 +2302,6 @@
renderAndVerify(params, "hole_cutout.png", TimeUnit.SECONDS.toNanos(2));
params = getSessionParamsBuilder()
- .setParser(LayoutPullParser.createFromString(layout))
- .setCallback(layoutLibCallback)
- .setTheme("Theme.Material.Light", false)
- .setRenderingMode(RenderingMode.V_SCROLL)
- .setFrameworkOverlayResources(frameworkOverlay)
- .build();
- params.setFlag(FLAG_KEY_SHOW_CUTOUT, true);
-
- renderAndVerify(params, "hole_cutout_edge.png", TimeUnit.SECONDS.toNanos(2));
-
- params = getSessionParamsBuilder()
.setConfigGenerator(ConfigGenerator.NEXUS_5_LAND)
.setParser(LayoutPullParser.createFromString(layout))
.setCallback(layoutLibCallback)
@@ -2322,6 +2311,6 @@
.build();
params.setFlag(FLAG_KEY_SHOW_CUTOUT, true);
- renderAndVerify(params, "hole_cutout_edge_landscape.png", TimeUnit.SECONDS.toNanos(2));
+ renderAndVerify(params, "hole_cutout_landscape.png", TimeUnit.SECONDS.toNanos(2));
}
}
