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

Commit 01937609 authored by Ram Parameswaran's avatar Ram Parameswaran Committed by Android (Google) Code Review
Browse files

Merge "Handle display cutouts larger than system bars" into main

parents a6701517 a84613cf

core/java/android/view/WindowLayout.java

+4 −4
Original line number Diff line number Diff line
@@ -124,16 +124,16 @@ public class WindowLayout { 
                    || cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES)) {

                final Insets systemBarsInsets = state.calculateInsets(

                        displayFrame, systemBars(), requestedVisibleTypes);

                if (systemBarsInsets.left > 0) {

                if (systemBarsInsets.left >= cutout.getSafeInsetLeft()) {

                    displayCutoutSafeExceptMaybeBars.left = MIN_X;

                }

                if (systemBarsInsets.top > 0) {

                if (systemBarsInsets.top >= cutout.getSafeInsetTop()) {

                    displayCutoutSafeExceptMaybeBars.top = MIN_Y;

                }

                if (systemBarsInsets.right > 0) {

                if (systemBarsInsets.right >= cutout.getSafeInsetRight()) {

                    displayCutoutSafeExceptMaybeBars.right = MAX_X;

                }

                if (systemBarsInsets.bottom > 0) {

                if (systemBarsInsets.bottom >= cutout.getSafeInsetBottom()) {

                    displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;

                }

            }