Merge "Moving away from obsolete Display#getRealSize()." into tm-dev am: 2c52c31571

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17524213

Change-Id: I459b61853ec1880b8e7a7e4abce0a0459d88062c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vadim Tryshev
2022-03-31 21:12:15 +00:00
committed by Automerger Merge Worker
@@ -1660,16 +1660,10 @@ public final class LauncherInstrumentation {
}
Point getRealDisplaySize() {
final Point size = new Point();
getContext().getSystemService(WindowManager.class).getDefaultDisplay().getRealSize(size);
final Rect winMetricsHeight = getContext().getSystemService(WindowManager.class)
final Rect displayBounds = 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;
return new Point(displayBounds.width(), displayBounds.height());
}
public void enableDebugTracing() {