Merge "Don't disable APIs which ensure the contrast of system bars" into main (4c94fd68) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/PhoneWindow.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -2583,7 +2583,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		mNavigationBarDividerColor = a.getColor(R.styleable.Window_navigationBarDividerColor,
		Color.TRANSPARENT);
		}
		if (!targetPreQ && !mEdgeToEdgeEnforced) {
		if (!targetPreQ) {
		mEnsureStatusBarContrastWhenTransparent = a.getBoolean(
		R.styleable.Window_enforceStatusBarContrast, false);
		mEnsureNavigationBarContrastWhenTransparent = a.getBoolean(
		@@ -3966,9 +3966,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {

		@Override
		public void setStatusBarContrastEnforced(boolean ensureContrast) {
		if (mEdgeToEdgeEnforced) {
		return;
		}
		mEnsureStatusBarContrastWhenTransparent = ensureContrast;
		if (mDecor != null) {
		mDecor.updateColorViews(null, false /* animate */);
		@@ -3982,9 +3979,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {

		@Override
		public void setNavigationBarContrastEnforced(boolean enforceContrast) {
		if (mEdgeToEdgeEnforced) {
		return;
		}
		mEnsureNavigationBarContrastWhenTransparent = enforceContrast;
		if (mDecor != null) {
		mDecor.updateColorViews(null, false /* animate */);