From 95086712145850d6a9f4d5327364729eaa6cb13d Mon Sep 17 00:00:00 2001 From: Naomi Musgrave Date: Thu, 15 Jun 2023 14:31:53 +0000 Subject: [PATCH] Revert "[getPossibleMaximumWindowMetrics] return bounds in natural orientation" This reverts commit 490f4937b0dc82459a71fdc888e1d44c127f0895. Reason for revert: b/287306886 failing launcher test Change-Id: I06ef09af28f507eeb33e4836c1ea0bd806a36be9 --- core/java/android/window/WindowMetricsController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/java/android/window/WindowMetricsController.java b/core/java/android/window/WindowMetricsController.java index 2858f0a1a725b..954f68633e571 100644 --- a/core/java/android/window/WindowMetricsController.java +++ b/core/java/android/window/WindowMetricsController.java @@ -145,13 +145,13 @@ public final class WindowMetricsController { for (int i = 0; i < possibleDisplayInfos.size(); i++) { currentDisplayInfo = possibleDisplayInfos.get(i); - // Calculate max bounds for natural rotation and state. - Rect maxBounds = new Rect(0, 0, currentDisplayInfo.getNaturalWidth(), - currentDisplayInfo.getNaturalHeight()); + // Calculate max bounds for this rotation and state. + Rect maxBounds = new Rect(0, 0, currentDisplayInfo.logicalWidth, + currentDisplayInfo.logicalHeight); - // Calculate insets for the natural max bounds. + // Calculate insets for the rotated max bounds. final boolean isScreenRound = (currentDisplayInfo.flags & Display.FLAG_ROUND) != 0; - // Initialize insets based on Surface.ROTATION_0. Note any window-provided insets + // Initialize insets based upon display rotation. Note any window-provided insets // will not be set. windowInsets = getWindowInsetsFromServerForDisplay( currentDisplayInfo.displayId, null /* token */,