Merge "Revert "[getPossibleMaximumWindowMetrics] return bounds in natural orientation"" into udc-qpr-dev am: 2b67c0f43b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23709092

Change-Id: I6256a3a843223b41bd30eb3e70eea7c6b52f2308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Naomi Musgrave
2023-06-16 15:26:42 +00:00
committed by Automerger Merge Worker

View File

@@ -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 */,