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

Commit 306bc345 authored by Ram Parameswaran's avatar Ram Parameswaran Committed by Automerger Merge Worker
Browse files

Merge "Handle display cutouts larger than system bars" into udc-qpr-dev am: 3975b984 

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



Change-Id: I99d138a72761171ef4bf134c975d111dbb86df14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19bc1909 3975b984

core/java/android/view/WindowLayout.java

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

                    || cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES)) {

                final Insets systemBarsInsets = state.calculateInsets(

                final Insets systemBarsInsets = state.calculateInsets(

                        displayFrame, systemBars(), requestedVisibleTypes);

                        displayFrame, systemBars(), requestedVisibleTypes);

                if (systemBarsInsets.left > 0) {

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

                    displayCutoutSafeExceptMaybeBars.left = MIN_X;

                    displayCutoutSafeExceptMaybeBars.left = MIN_X;

                }

                }

                if (systemBarsInsets.top > 0) {

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

                    displayCutoutSafeExceptMaybeBars.top = MIN_Y;

                    displayCutoutSafeExceptMaybeBars.top = MIN_Y;

                }

                }

                if (systemBarsInsets.right > 0) {

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

                    displayCutoutSafeExceptMaybeBars.right = MAX_X;

                    displayCutoutSafeExceptMaybeBars.right = MAX_X;

                }

                }

                if (systemBarsInsets.bottom > 0) {

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

                    displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;

                    displayCutoutSafeExceptMaybeBars.bottom = MAX_Y;

                }

                }

            }

            }