Merge "Ensure Contrast: Address API feedback" into qt-dev (0ab3251b) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -571,8 +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 enforceNavigationBarContrast = 16844203; // 0x10105ab
		field public static final int enforceStatusBarContrast = 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
		@@ -51523,10 +51523,10 @@ 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 boolean isNavigationBarContrastEnforced();
		method public abstract boolean isShortcutKey(int, android.view.KeyEvent);
		method public boolean isStatusBarContrastEnforced();
		method public boolean isWideColorGamut();
		method public final void makeActive();
		method protected abstract void onActive();
		@@ -51559,8 +51559,6 @@ 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);
		@@ -51577,6 +51575,7 @@ package android.view {
		method public void setLogo(@DrawableRes int);
		method public void setMediaController(android.media.session.MediaController);
		method public abstract void setNavigationBarColor(@ColorInt int);
		method public void setNavigationBarContrastEnforced(boolean);
		method public void setNavigationBarDividerColor(@ColorInt int);
		method public void setReenterTransition(android.transition.Transition);
		method public abstract void setResizingCaptionDrawable(android.graphics.drawable.Drawable);
		@@ -51589,6 +51588,7 @@ package android.view {
		method public void setSharedElementsUseOverlay(boolean);
		method public void setSoftInputMode(int);
		method public abstract void setStatusBarColor(@ColorInt int);
		method public void setStatusBarContrastEnforced(boolean);
		method public void setSustainedPerformanceMode(boolean);
		method public void setSystemGestureExclusionRects(@NonNull java.util.List<android.graphics.Rect>);
		method public abstract void setTitle(CharSequence);

core/java/android/app/Activity.java

+2 −2

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

core/java/android/view/Window.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -2341,11 +2341,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#ensuringStatusBarContrastWhenTransparent
		* @see #isEnsuringStatusBarContrastWhenTransparent
		* @see android.R.attr#enforceStatusBarContrast
		* @see #isStatusBarContrastEnforced
		* @see #setStatusBarColor
		*/
		public void setEnsuringStatusBarContrastWhenTransparent(boolean ensureContrast) {
		public void setStatusBarContrastEnforced(boolean ensureContrast) {
		}

		/**
		@@ -2356,11 +2356,11 @@ public abstract class Window {
		* property has no effect.
		*
		* @return true, if the system is ensuring contrast, false otherwise.
		* @see android.R.attr#ensuringStatusBarContrastWhenTransparent
		* @see #setEnsuringStatusBarContrastWhenTransparent
		* @see android.R.attr#enforceStatusBarContrast
		* @see #setStatusBarContrastEnforced
		* @see #setStatusBarColor
		*/
		public boolean isEnsuringStatusBarContrastWhenTransparent() {
		public boolean isStatusBarContrastEnforced() {
		return false;
		}

		@@ -2375,11 +2375,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#ensuringNavigationBarContrastWhenTransparent
		* @see #isEnsuringNavigationBarContrastWhenTransparent
		* @see android.R.attr#enforceNavigationBarContrast
		* @see #isNavigationBarContrastEnforced
		* @see #setNavigationBarColor
		*/
		public void setEnsuringNavigationBarContrastWhenTransparent(boolean ensureContrast) {
		public void setNavigationBarContrastEnforced(boolean enforceContrast) {
		}

		/**
		@@ -2390,11 +2390,11 @@ public abstract class Window {
		* property has no effect.
		*
		* @return true, if the system is ensuring contrast, false otherwise.
		* @see android.R.attr#ensuringNavigationBarContrastWhenTransparent
		* @see #setEnsuringNavigationBarContrastWhenTransparent
		* @see android.R.attr#enforceNavigationBarContrast
		* @see #setNavigationBarContrastEnforced
		* @see #setNavigationBarColor
		*/
		public boolean isEnsuringNavigationBarContrastWhenTransparent() {
		public boolean isNavigationBarContrastEnforced() {
		return false;
		}

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

+7 −7

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

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

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

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

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

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

core/res/res/values/attrs.xml

+8 −8

Original line number	Diff line number	Diff line
		@@ -2104,8 +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#setEnsuringStatusBarContrastWhenTransparent -->
		<attr name="ensuringStatusBarContrastWhenTransparent" format="boolean" />
		@see android.view.Window#setStatusBarContrastEnforced -->
		<attr name="enforceStatusBarContrast" format="boolean" />

		<!-- Sets whether the system should ensure that the navigation bar has enough
		contrast when a fully transparent background is requested.
		@@ -2120,8 +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#setEnsuringNavigationBarContrastWhenTransparent -->
		<attr name="ensuringNavigationBarContrastWhenTransparent" format="boolean" />
		@see android.view.Window#setNavigationBarContrastEnforced -->
		<attr name="enforceNavigationBarContrast" format="boolean" />

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

		<declare-styleable name="Shortcut">