Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Naomi Musgrave
2023-06-16 14:55:40 +00:00
committed by Android (Google) Code Review
parent f114d7ee35 9508671214
commit 2b67c0f43b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/window/WindowMetricsController.java
View File

@@ -145,13 +145,13 @@ public final class WindowMetricsController {
for (int i = 0; i < possibleDisplayInfos.size(); i++) { for (int i = 0; i < possibleDisplayInfos.size(); i++) {
currentDisplayInfo = possibleDisplayInfos.get(i); currentDisplayInfo = possibleDisplayInfos.get(i);
// Calculate max bounds for natural rotation and state. // Calculate max bounds for this rotation and state.
Rect maxBounds = new Rect(0, 0, currentDisplayInfo.getNaturalWidth(), Rect maxBounds = new Rect(0, 0, currentDisplayInfo.logicalWidth,
currentDisplayInfo.getNaturalHeight()); 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; 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. // will not be set.
windowInsets = getWindowInsetsFromServerForDisplay( windowInsets = getWindowInsetsFromServerForDisplay(
currentDisplayInfo.displayId, null /* token */, currentDisplayInfo.displayId, null /* token */,