diff options
| author | Sam Dubey <dubeyshubham@google.com> | 2022-07-18 06:13:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-07-18 06:13:03 +0000 |
| commit | 661d05308a3ca765dea989a626e76e903ab6f1b7 (patch) | |
| tree | 0dbc8dc06a77f91a141960c2ce51daf8e3c22143 /core/java | |
| parent | c583cc014dd24938d4da44da74174eb2568c63bb (diff) | |
| parent | bc0d5539e6ce80bb686dd38f6517f9c2dcd77aa0 (diff) | |
Merge "Revert "Reland "Make extra navigation bar count towards non decor frame"""" into tm-qpr-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/WindowLayout.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/view/WindowLayout.java b/core/java/android/view/WindowLayout.java index 5ed9d2f90a72..57a0330e3c18 100644 --- a/core/java/android/view/WindowLayout.java +++ b/core/java/android/view/WindowLayout.java @@ -118,11 +118,11 @@ public class WindowLayout { } if (cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES) { if (displayFrame.width() < displayFrame.height()) { - displayCutoutSafeExceptMaybeBars.top = MIN_Y; - displayCutoutSafeExceptMaybeBars.bottom = MAX_Y; + displayCutoutSafeExceptMaybeBars.top = Integer.MIN_VALUE; + displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE; } else { - displayCutoutSafeExceptMaybeBars.left = MIN_X; - displayCutoutSafeExceptMaybeBars.right = MAX_X; + displayCutoutSafeExceptMaybeBars.left = Integer.MIN_VALUE; + displayCutoutSafeExceptMaybeBars.right = Integer.MAX_VALUE; } } final boolean layoutInsetDecor = (attrs.flags & FLAG_LAYOUT_INSET_DECOR) != 0; @@ -132,23 +132,23 @@ public class WindowLayout { final Insets systemBarsInsets = state.calculateInsets( displayFrame, WindowInsets.Type.systemBars(), requestedVisibilities); if (systemBarsInsets.left > 0) { - displayCutoutSafeExceptMaybeBars.left = MIN_X; + displayCutoutSafeExceptMaybeBars.left = Integer.MIN_VALUE; } if (systemBarsInsets.top > 0) { - displayCutoutSafeExceptMaybeBars.top = MIN_Y; + displayCutoutSafeExceptMaybeBars.top = Integer.MIN_VALUE; } if (systemBarsInsets.right > 0) { - displayCutoutSafeExceptMaybeBars.right = MAX_X; + displayCutoutSafeExceptMaybeBars.right = Integer.MAX_VALUE; } if (systemBarsInsets.bottom > 0) { - displayCutoutSafeExceptMaybeBars.bottom = MAX_Y; + displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE; } } if (type == TYPE_INPUT_METHOD) { final InsetsSource navSource = state.peekSource(ITYPE_NAVIGATION_BAR); if (navSource != null && navSource.calculateInsets(displayFrame, true).bottom > 0) { // The IME can always extend under the bottom cutout if the navbar is there. - displayCutoutSafeExceptMaybeBars.bottom = MAX_Y; + displayCutoutSafeExceptMaybeBars.bottom = Integer.MAX_VALUE; } } final boolean attachedInParent = attachedWindowFrame != null && !layoutInScreen; |