Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95086712 authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Android (Google) Code Review
Browse files

Revert "[getPossibleMaximumWindowMetrics] return bounds in natural orientation" 

This reverts commit 490f4937.

Reason for revert: b/287306886 failing launcher test

Change-Id: I06ef09af28f507eeb33e4836c1ea0bd806a36be9
parent 490f4937

core/java/android/window/WindowMetricsController.java

+5 −5
Original line number Diff line number Diff line
@@ -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 */,