Moving away from obsolete Display#getRealSize().
Step 1: use both new and old APIs and make sure they return the same values.
Bug: 202567877, 227307209
Test: presubmit
Change-Id: I86fbb0ca089a88b5ff787a5c353664a192fb7e79
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 8e0eb7b..f270cd5 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -877,10 +877,9 @@
}
/**
+ * @return the Workspace object.
* @deprecated use goHome().
* Presses nav bar home button.
- *
- * @return the Workspace object.
*/
@Deprecated
public Workspace pressHome() {
@@ -1653,6 +1652,13 @@
Point getRealDisplaySize() {
final Point size = new Point();
getContext().getSystemService(WindowManager.class).getDefaultDisplay().getRealSize(size);
+ final Rect winMetricsHeight = getContext().getSystemService(WindowManager.class)
+ .getMaximumWindowMetrics()
+ .getBounds();
+ final Point winMetricsSize = new Point(winMetricsHeight.width(), winMetricsHeight.height());
+ if (!winMetricsSize.equals(size)) {
+ fail("Display size mismatch: " + size + " vs " + winMetricsSize);
+ }
return size;
}