From 91490d4cd963a4eadbf484c176d5616d66d22b59 Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Wed, 28 Mar 2018 18:37:20 -0700 Subject: [PATCH] Remove Automatic color mode option This is not yet implemented and should not appear as an option. Bug: 76420446 Test: make RunSettingsRoboTests -j100 Change-Id: I40f1f48cc93417536a1680923c7628139a0534b1 --- .../display/ColorModePreferenceFragment.java | 13 ++++--------- .../display/ColorModePreferenceFragmentTest.java | 4 +--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index 6e4bd1f8e44..089a5a608ba 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -41,9 +41,6 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment static final String KEY_COLOR_MODE_BOOSTED = "color_mode_boosted"; @VisibleForTesting static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated"; - // TODO have a real key for "automatic" rather than just re-using "saturated" - @VisibleForTesting - static final String KEY_COLOR_MODE_AUTOMATIC = "color_mode_saturated"; private ColorDisplayController mController; @@ -91,18 +88,16 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_boosted), KEY_COLOR_MODE_BOOSTED, enabled), new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_saturated), - KEY_COLOR_MODE_SATURATED, enabled), - new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_automatic), - KEY_COLOR_MODE_AUTOMATIC, enabled) + KEY_COLOR_MODE_SATURATED, enabled) ); } @Override protected String getDefaultKey() { - if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_SATURATED) { + final int colorMode = mController.getColorMode(); + if (colorMode == ColorDisplayController.COLOR_MODE_SATURATED) { return KEY_COLOR_MODE_SATURATED; - } - if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_BOOSTED) { + } else if (colorMode == ColorDisplayController.COLOR_MODE_BOOSTED) { return KEY_COLOR_MODE_BOOSTED; } return KEY_COLOR_MODE_NATURAL; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 6df0c0411c8..a9f4151d226 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -79,15 +79,13 @@ public class ColorModePreferenceFragmentTest { when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application); List candidates = mFragment.getCandidates(); - assertThat(candidates.size()).isEqualTo(4); + assertThat(candidates.size()).isEqualTo(3); assertThat(candidates.get(0).getKey()) .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); assertThat(candidates.get(1).getKey()) .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); assertThat(candidates.get(2).getKey()) .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); - assertThat(candidates.get(3).getKey()) - .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC); } @Test