Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c92430b authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Remove Automatic color mode option" into pi-dev

parents 7df9791d 91490d4c

src/com/android/settings/display/ColorModePreferenceFragment.java

+4 −9
Original line number Diff line number Diff line
@@ -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;

tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java

+1 −3
Original line number Diff line number Diff line
@@ -79,15 +79,13 @@ public class ColorModePreferenceFragmentTest { 
        when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);

        List<? extends CandidateInfo> 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