Merge "Handle display cutouts larger than system bars" into udc-qpr-dev (3975b984) · Commits · e / os / android_frameworks_base

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;
	}		}
	}		}