From 8c7ca4f5c2eefe2f7059a8b49890351d54840a7b Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Wed, 17 Apr 2019 11:35:22 +0200 Subject: [PATCH] Ensure Contrast: Address API feedback Fixes: 130647853 Test: make checkapi Test: atest EnsureBarContrastTest NavigationBarColorTest Change-Id: Iafbdce8476134df56ea5d15155391b10afc9ce94 --- api/current.txt | 12 +++++------ core/java/android/app/Activity.java | 4 ++-- core/java/android/view/Window.java | 24 +++++++++++----------- .../com/android/internal/policy/PhoneWindow.java | 14 ++++++------- core/res/res/values/attrs.xml | 16 +++++++-------- core/res/res/values/public.xml | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/api/current.txt b/api/current.txt index f9db63d68bd6..bc877f80a360 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 @@ -51522,10 +51522,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(); @@ -51558,8 +51558,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); @@ -51576,6 +51574,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); @@ -51588,6 +51587,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); method public abstract void setTitle(CharSequence); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 6e935e1e56c4..86b10b90fa7c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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)); } diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index b0ec6210d828..cbcc057811fd 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -2341,11 +2341,11 @@ public abstract class Window { *

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 { *

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; } diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 21f8d87e7e8c..daa57e05aef6 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -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; } diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index ab9a298f3060..ce1e5c3cf794 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2104,8 +2104,8 @@

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 --> - + @see android.view.Window#setStatusBarContrastEnforced --> + - + @see android.view.Window#setNavigationBarContrastEnforced --> + - - - - + + + + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index a7af144ab9ed..33bc34197851 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2943,8 +2943,8 @@ - - + + -- 2.11.0