Merge "Don't apply corner cutout insets if we're already inset enough" into pi-dev am: f0cbbff692 (99a0e6ee) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,18 @@ public class PhoneStatusBarView extends PanelBar {
		if (cornerCutoutMargins != null) {
		lp.leftMargin = Math.max(lp.leftMargin, cornerCutoutMargins.first);
		lp.rightMargin = Math.max(lp.rightMargin, cornerCutoutMargins.second);

		// If we're already inset enough (e.g. on the status bar side), we can have 0 margin
		WindowInsets insets = getRootWindowInsets();
		int leftInset = insets.getSystemWindowInsetLeft();
		int rightInset = insets.getSystemWindowInsetRight();
		if (lp.leftMargin <= leftInset) {
		lp.leftMargin = 0;
		}
		if (lp.rightMargin <= rightInset) {
		lp.rightMargin = 0;
		}

		}
		}