Merge "System Bars: API to ensure contrast when app requested transparent bar" into qt-dev (928a1a18) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -571,6 +571,8 @@ package android {
		field public static final int endX = 16844050; // 0x1010512
		field public static final int endY = 16844051; // 0x1010513
		field @Deprecated public static final int endYear = 16843133; // 0x101017d
		field public static final int ensuringNavigationBarContrastWhenTransparent = 16844203; // 0x10105ab
		field public static final int ensuringStatusBarContrastWhenTransparent = 16844202; // 0x10105aa
		field public static final int enterFadeDuration = 16843532; // 0x101030c
		field public static final int entries = 16842930; // 0x10100b2
		field public static final int entryValues = 16843256; // 0x10101f8
		@@ -51774,6 +51776,8 @@ package android.view {
		method public void injectInputEvent(android.view.InputEvent);
		method public abstract void invalidatePanelMenu(int);
		method public final boolean isActive();
		method public boolean isEnsuringNavigationBarContrastWhenTransparent();
		method public boolean isEnsuringStatusBarContrastWhenTransparent();
		method public abstract boolean isFloating();
		method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
		method public boolean isWideColorGamut();
		@@ -51808,6 +51812,8 @@ package android.view {
		method protected void setDefaultWindowFormat(int);
		method public void setDimAmount(float);
		method public void setElevation(float);
		method public void setEnsuringNavigationBarContrastWhenTransparent(boolean);
		method public void setEnsuringStatusBarContrastWhenTransparent(boolean);
		method public void setEnterTransition(android.transition.Transition);
		method public void setExitTransition(android.transition.Transition);
		method public abstract void setFeatureDrawable(int, android.graphics.drawable.Drawable);

core/java/android/app/Activity.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -4909,10 +4909,11 @@ public class Activity extends ContextThemeWrapper
		final boolean targetPreQ = targetSdk < Build.VERSION_CODES.Q;
		if (!targetPreQ) {
		mTaskDescription.setEnsureStatusBarContrastWhenTransparent(a.getBoolean(
		R.styleable.ActivityTaskDescription_ensureStatusBarContrastWhenTransparent,
		R.styleable.ActivityTaskDescription_ensuringStatusBarContrastWhenTransparent,
		false));
		mTaskDescription.setEnsureNavigationBarContrastWhenTransparent(a.getBoolean(
		R.styleable.ActivityTaskDescription_ensureNavigationBarContrastWhenTransparent,
		R.styleable
		.ActivityTaskDescription_ensuringNavigationBarContrastWhenTransparent,
		true));
		}

core/java/android/view/Window.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -2340,10 +2340,11 @@ public abstract class Window {
		* <p>When the status bar color has a non-zero alpha value, the value of this
		* property has no effect.
		*
		* @see android.R.attr#ensureStatusBarContrastWhenTransparent
		* @hide pending API
		* @see android.R.attr#ensuringStatusBarContrastWhenTransparent
		* @see #isEnsuringStatusBarContrastWhenTransparent
		* @see #setStatusBarColor
		*/
		public void setEnsureStatusBarContrastWhenTransparent(boolean ensureContrast) {
		public void setEnsuringStatusBarContrastWhenTransparent(boolean ensureContrast) {
		}

		/**
		@@ -2353,11 +2354,12 @@ public abstract class Window {
		* <p>When the status bar color has a non-zero alpha value, the value of this
		* property has no effect.
		*
		* @see android.R.attr#ensureStatusBarContrastWhenTransparent
		* @return true, if the system is ensuring contrast, false otherwise.
		* @hide pending API
		* @see android.R.attr#ensuringStatusBarContrastWhenTransparent
		* @see #setEnsuringStatusBarContrastWhenTransparent
		* @see #setStatusBarColor
		*/
		public boolean isEnsureStatusBarContrastWhenTransparent() {
		public boolean isEnsuringStatusBarContrastWhenTransparent() {
		return false;
		}

		@@ -2372,10 +2374,11 @@ public abstract class Window {
		* <p>When the navigation bar color has a non-zero alpha value, the value of this
		* property has no effect.
		*
		* @see android.R.attr#ensureNavigationBarContrastWhenTransparent
		* @hide pending API
		* @see android.R.attr#ensuringNavigationBarContrastWhenTransparent
		* @see #isEnsuringNavigationBarContrastWhenTransparent
		* @see #setNavigationBarColor
		*/
		public void setEnsureNavigationBarContrastWhenTransparent(boolean ensureContrast) {
		public void setEnsuringNavigationBarContrastWhenTransparent(boolean ensureContrast) {
		}

		/**
		@@ -2386,10 +2389,11 @@ public abstract class Window {
		* property has no effect.
		*
		* @return true, if the system is ensuring contrast, false otherwise.
		* @see android.R.attr#ensureNavigationBarContrastWhenTransparent
		* @hide pending API
		* @see android.R.attr#ensuringNavigationBarContrastWhenTransparent
		* @see #setEnsuringNavigationBarContrastWhenTransparent
		* @see #setNavigationBarColor
		*/
		public boolean isEnsureNavigationBarContrastWhenTransparent() {
		public boolean isEnsuringNavigationBarContrastWhenTransparent() {
		return false;
		}

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -2464,9 +2464,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}
		if (!targetPreQ) {
		mEnsureStatusBarContrastWhenTransparent = a.getBoolean(
		R.styleable.Window_ensureStatusBarContrastWhenTransparent, false);
		R.styleable.Window_ensuringStatusBarContrastWhenTransparent, false);
		mEnsureNavigationBarContrastWhenTransparent = a.getBoolean(
		R.styleable.Window_ensureNavigationBarContrastWhenTransparent, true);
		R.styleable.Window_ensuringNavigationBarContrastWhenTransparent, true);
		}

		WindowManager.LayoutParams params = getAttributes();
		@@ -3857,7 +3857,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		@Override
		public void setEnsureStatusBarContrastWhenTransparent(boolean ensureContrast) {
		public void setEnsuringStatusBarContrastWhenTransparent(boolean ensureContrast) {
		mEnsureStatusBarContrastWhenTransparent = ensureContrast;
		if (mDecor != null) {
		mDecor.updateColorViews(null, false /* animate */);
		@@ -3865,12 +3865,12 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		@Override
		public boolean isEnsureStatusBarContrastWhenTransparent() {
		public boolean isEnsuringStatusBarContrastWhenTransparent() {
		return mEnsureStatusBarContrastWhenTransparent;
		}

		@Override
		public void setEnsureNavigationBarContrastWhenTransparent(boolean ensureContrast) {
		public void setEnsuringNavigationBarContrastWhenTransparent(boolean ensureContrast) {
		mEnsureNavigationBarContrastWhenTransparent = ensureContrast;
		if (mDecor != null) {
		mDecor.updateColorViews(null, false /* animate */);
		@@ -3878,7 +3878,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		@Override
		public boolean isEnsureNavigationBarContrastWhenTransparent() {
		public boolean isEnsuringNavigationBarContrastWhenTransparent() {
		return mEnsureNavigationBarContrastWhenTransparent;
		}

core/res/res/values/attrs.xml

+8 −10

Original line number	Diff line number	Diff line
		@@ -2104,9 +2104,8 @@
		<p>If the app does not target at least {@link android.os.Build.VERSION_CODES#Q Q},
		this attribute is ignored.

		@see android.view.Window#setEnsureStatusBarContrastWhenTransparent
		@hide pendingAPI -->
		<attr name="ensureStatusBarContrastWhenTransparent" format="boolean" />
		@see android.view.Window#setEnsuringStatusBarContrastWhenTransparent -->
		<attr name="ensuringStatusBarContrastWhenTransparent" format="boolean" />

		<!-- Sets whether the system should ensure that the navigation bar has enough
		contrast when a fully transparent background is requested.
		@@ -2121,9 +2120,8 @@
		<p>If the app does not target at least {@link android.os.Build.VERSION_CODES#Q Q},
		this attribute is ignored.

		@see android.view.Window#setEnsureNavigationBarContrastWhenTransparent
		@hide pendingApi -->
		<attr name="ensureNavigationBarContrastWhenTransparent" format="boolean" />
		@see android.view.Window#setEnsuringNavigationBarContrastWhenTransparent -->
		<attr name="ensuringNavigationBarContrastWhenTransparent" format="boolean" />

		<!-- The duration, in milliseconds, of the window background fade duration
		when transitioning into or away from an Activity when called with an
		@@ -9014,10 +9012,10 @@
		<!-- @hide From Theme.navigationBarColor, used for the TaskDescription navigation bar
		color. -->
		<attr name="navigationBarColor"/>
		<!-- @hide From Window.ensureStatusBarContrastWhenTransparent -->
		<attr name="ensureStatusBarContrastWhenTransparent"/>
		<!-- @hide From Window.ensureNavigationBarContrastWhenTransparent -->
		<attr name="ensureNavigationBarContrastWhenTransparent"/>
		<!-- @hide From Window.ensuringStatusBarContrastWhenTransparent -->
		<attr name="ensuringStatusBarContrastWhenTransparent"/>
		<!-- @hide From Window.ensuringNavigationBarContrastWhenTransparent -->
		<attr name="ensuringNavigationBarContrastWhenTransparent"/>
		</declare-styleable>

		<declare-styleable name="Shortcut">