PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Automatic color mode option" into pi-dev am: 0c92430be4

Browse Source 
am: 00606b5d2a

Change-Id: I31fa05e75ddadbf11cd670e2b89455d222212b3e
This commit is contained in:
Christine Franks
2018-04-09 14:44:56 -07:00
committed by android-build-merger
parent b2924dec8a 00606b5d2a
commit 036cf51ac4
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/display/ColorModePreferenceFragment.java
View File

@@ -41,9 +41,6 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment
static final String KEY_COLOR_MODE_BOOSTED = "color_mode_boosted"; static final String KEY_COLOR_MODE_BOOSTED = "color_mode_boosted";
@VisibleForTesting @VisibleForTesting
static final String KEY_COLOR_MODE_SATURATED = "color_mode_saturated"; 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; private ColorDisplayController mController;
@@ -91,18 +88,16 @@ public class ColorModePreferenceFragment extends RadioButtonPickerFragment
new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_boosted), new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_boosted),
KEY_COLOR_MODE_BOOSTED, enabled), KEY_COLOR_MODE_BOOSTED, enabled),
new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_saturated), new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_saturated),
KEY_COLOR_MODE_SATURATED, enabled), KEY_COLOR_MODE_SATURATED, enabled)
new ColorModeCandidateInfo(c.getText(R.string.color_mode_option_automatic),
KEY_COLOR_MODE_AUTOMATIC, enabled)
); );
} }
@Override @Override
protected String getDefaultKey() { 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; return KEY_COLOR_MODE_SATURATED;
} } else if (colorMode == ColorDisplayController.COLOR_MODE_BOOSTED) {
if (mController.getColorMode() == ColorDisplayController.COLOR_MODE_BOOSTED) {
return KEY_COLOR_MODE_BOOSTED; return KEY_COLOR_MODE_BOOSTED;
} }
return KEY_COLOR_MODE_NATURAL; return KEY_COLOR_MODE_NATURAL;

4
tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
View File

@@ -79,15 +79,13 @@ public class ColorModePreferenceFragmentTest {
when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application); when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
List<? extends CandidateInfo> candidates = mFragment.getCandidates(); List<? extends CandidateInfo> candidates = mFragment.getCandidates();
assertThat(candidates.size()).isEqualTo(4); assertThat(candidates.size()).isEqualTo(3);
assertThat(candidates.get(0).getKey()) assertThat(candidates.get(0).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
assertThat(candidates.get(1).getKey()) assertThat(candidates.get(1).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
assertThat(candidates.get(2).getKey()) assertThat(candidates.get(2).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED); .isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
assertThat(candidates.get(3).getKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_AUTOMATIC);
} }
@Test @Test