From fbe8a1318bc3f3fd79281defd85402a14a5a0a83 Mon Sep 17 00:00:00 2001 From: Daniel Solomon Date: Mon, 9 Apr 2018 15:09:13 -0700 Subject: [PATCH] Hide color mode preference depending on Accessibility settings Currently, when certain Accessibility color transforms are enabled, the color mode preference radio buttons are disabled. To avoid confusing users, hide the color mode preference entirely. If the color mode settings screen is already open when the Accessibility transforms are enabled, return the user back to the previous screen. Bug: 77695840 Test: make ROBOTEST_FILTER=ColorModePreferenceFragmentTest RunSettingsRoboTests -j40 Change-Id: I44812713bdc739b843e5806711d25ea950aa6250 --- .../ColorModePreferenceController.java | 4 +- .../display/ColorModePreferenceFragment.java | 23 +++----- .../ColorModePreferenceFragmentTest.java | 54 ++----------------- 3 files changed, 15 insertions(+), 66 deletions(-) diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java index 7fa978209d7..31f53930a7e 100644 --- a/src/com/android/settings/display/ColorModePreferenceController.java +++ b/src/com/android/settings/display/ColorModePreferenceController.java @@ -41,7 +41,9 @@ public class ColorModePreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - return mConfigWrapper.isScreenWideColorGamut() ? AVAILABLE : DISABLED_FOR_USER; + return mConfigWrapper.isScreenWideColorGamut() + && !getColorDisplayController().getAccessibilityTransformActivated() ? + AVAILABLE : DISABLED_FOR_USER; } @Override diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 089a5a608ba..9f947e9e97a 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -16,7 +16,6 @@ package com.android.settings.display; import android.content.Context; import android.graphics.drawable.Drawable; import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; @@ -25,7 +24,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.applications.LayoutPreference; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; -import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.widget.CandidateInfo; import java.util.Arrays; @@ -81,14 +79,13 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment @Override protected List getCandidates() { Context c = getContext(); - final boolean enabled = !mController.getAccessibilityTransformActivated(); return Arrays.asList( new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_natural), - KEY_COLOR_MODE_NATURAL, enabled), + KEY_COLOR_MODE_NATURAL, true /* enabled */), new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_boosted), - KEY_COLOR_MODE_BOOSTED, enabled), + KEY_COLOR_MODE_BOOSTED, true /* enabled */), new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_saturated), - KEY_COLOR_MODE_SATURATED, enabled) + KEY_COLOR_MODE_SATURATED, true /* enabled */) ); } @@ -153,16 +150,10 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment @Override public void onAccessibilityTransformChanged(boolean state) { - // Disable controls when a11y transforms are enabled, and vice versa - final PreferenceScreen screen = getPreferenceScreen(); - if (screen != null) { - final int count = screen.getPreferenceCount(); - for (int i = 0; i < count; i++) { - final Preference pref = screen.getPreference(i); - if (pref instanceof RadioButtonPreference) { - pref.setEnabled(!state); - } - } + // Color modes are no not configurable when Accessibility transforms are enabled. Close + // this fragment in that case. + if (state) { + getActivity().onBackPressed(); } } } diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index a9f4151d226..4264daa2835 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; @@ -25,6 +24,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.app.Activity; import android.os.Bundle; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; @@ -34,7 +34,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.widget.CandidateInfo; import org.junit.Before; @@ -46,7 +45,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @@ -58,13 +56,13 @@ public class ColorModePreferenceFragmentTest { private ColorDisplayController mController; @Mock - private PreferenceScreen mScreen; + private Activity mActivity; @Before public void setup() { MockitoAnnotations.initMocks(this); - mFragment = spy(new ColorModePreferenceFragmentTestable(mScreen)); + mFragment = spy(new ColorModePreferenceFragment()); ReflectionHelpers.setField(mFragment, "mController", mController); } @@ -159,50 +157,8 @@ public class ColorModePreferenceFragmentTest { @Test public void onAccessibilityTransformChanged_toggles() { - final int radioPrefsCount = 3; - List radioPrefs = new ArrayList<>(); - for (int i = 0; i < radioPrefsCount; i++) { - radioPrefs.add(mock(RadioButtonPreference.class)); - } - - when(mScreen.getPreferenceCount()).thenReturn(radioPrefs.size()); - when(mScreen.getPreference(anyInt())).thenAnswer(invocation -> { - final Object[] args = invocation.getArguments(); - return radioPrefs.get((int) args[0]); - }); - + when(mFragment.getActivity()).thenReturn(mActivity); mFragment.onAccessibilityTransformChanged(true /* state */); - for (int i = 0; i < radioPrefsCount; i++) { - verify(radioPrefs.get(i)).setEnabled(false); - } - - mFragment.onAccessibilityTransformChanged(false /* state */); - for (int i = 0; i < radioPrefsCount; i++) { - verify(radioPrefs.get(i)).setEnabled(true); - } - } - - private static class ColorModePreferenceFragmentTestable - extends ColorModePreferenceFragment { - - private final PreferenceScreen mPreferenceScreen; - - private ColorModePreferenceFragmentTestable(PreferenceScreen screen) { - mPreferenceScreen = screen; - } - - /** - * A method to return a mock PreferenceScreen. - * A real ColorModePreferenceFragment calls super.getPreferenceScreen() to get its - * PreferenceScreen handle, which internally dereferenced a PreferenceManager. But in this - * test scenario, the PreferenceManager object is uninitialized, so we need to supply the - * PreferenceScreen directly. - * - * @return a mock PreferenceScreen - */ - @Override - public PreferenceScreen getPreferenceScreen() { - return mPreferenceScreen; - } + verify(mActivity).onBackPressed(); } }