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

Commit 305f900b authored by Romain Guy's avatar Romain Guy
Browse files

Add saturation boost setting 

Bug: 62238038 62377592 38225028
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=com.android.settings.display.ColorModePreferenceControllerTest
Change-Id: Iae8f4b25966ff28fde127e6103b2c03c67862cf0
parent 5bf8d874

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,8 @@ 
    <string name="display_settings">Display</string>

    <!-- Sound & display settings screen, accelerometer-based rotation check box label -->

    <string name="accelerometer_title">Auto-rotate screen</string>

    <!-- Display settings screen, vivid (or vibrant or saturated) color mode switch label [CHAR LIMIT=30] -->

    <string name="color_mode_title">Vivid colors</string>

    <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->

    <string name="accelerometer_summary_on" product="tablet">Switch orientation automatically when rotating tablet</string>

    <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->

res/xml/development_prefs.xml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
        android:fragment="com.android.settings.applications.ConvertToFbe" />



    <com.android.settings.development.ColorModePreference

        android:key="color_mode"

        android:key="picture_color_mode"

        android:title="@string/picture_color_mode"

        android:summary="@string/picture_color_mode_desc" />

res/xml/display_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ 
        android:key="auto_rotate"

        android:title="@string/accelerometer_title" />



    <SwitchPreference

        android:key="color_mode"

        android:title="@string/color_mode_title" />



    <Preference

        android:key="font_size"

        android:title="@string/title_font_size"

src/com/android/settings/DisplaySettings.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.settings.display.AutoBrightnessPreferenceController; 
import com.android.settings.display.AutoRotatePreferenceController;

import com.android.settings.display.BrightnessLevelPreferenceController;

import com.android.settings.display.CameraGesturePreferenceController;

import com.android.settings.display.ColorModePreferenceController;

import com.android.settings.display.FontSizePreferenceController;

import com.android.settings.display.LiftToWakePreferenceController;

import com.android.settings.display.NightDisplayPreferenceController;
@@ -105,6 +106,7 @@ public class DisplaySettings extends DashboardFragment { 
        controllers.add(new WallpaperPreferenceController(context));

        controllers.add(new ThemePreferenceController(context));

        controllers.add(new BrightnessLevelPreferenceController(context, lifecycle));

        controllers.add(new ColorModePreferenceController(context));

        return controllers;

    }

src/com/android/settings/development/DevelopmentSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 
    private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";

    private static final String USB_CONFIGURATION_KEY = "select_usb_configuration";

    private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";

    private static final String KEY_COLOR_MODE = "color_mode";

    private static final String KEY_COLOR_MODE = "picture_color_mode";

    private static final String FORCE_RESIZABLE_KEY = "force_resizable_activities";

    private static final String COLOR_TEMPERATURE_KEY = "color_temperature";
@@ -555,7 +555,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment 


        mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE);

        mColorModePreference.updateCurrentAndSupported();

        if (mColorModePreference.getColorModeCount() < 2) {

        if (mColorModePreference.getColorModeCount() < 2 ||

                getContext().getDisplay().isWideColorGamut()) {

            removePreference(KEY_COLOR_MODE);

            mColorModePreference = null;

        }