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

Commit a1cf4d56 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[getPossibleMaximumWindowMetrics] return bounds in natural orientation"... 

Merge "[getPossibleMaximumWindowMetrics] return bounds in natural orientation" into udc-qpr-dev am: 959d2e64

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



Change-Id: I73c4549f9ecedd5fdaab9cb6ac3f86957f3fda9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c509431 959d2e64

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 this rotation and state.

            Rect maxBounds = new Rect(0, 0, currentDisplayInfo.logicalWidth,

                    currentDisplayInfo.logicalHeight);

            // Calculate max bounds for natural rotation and state.

            Rect maxBounds = new Rect(0, 0, currentDisplayInfo.getNaturalWidth(),

                    currentDisplayInfo.getNaturalHeight());



            // Calculate insets for the rotated max bounds.

            // Calculate insets for the natural max bounds.

            final boolean isScreenRound = (currentDisplayInfo.flags & Display.FLAG_ROUND) != 0;

            // Initialize insets based upon display rotation. Note any window-provided insets

            // Initialize insets based on Surface.ROTATION_0. Note any window-provided insets

            // will not be set.

            windowInsets = getWindowInsetsFromServerForDisplay(

                    currentDisplayInfo.displayId, null /* token */,