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

Commit f19809ee authored by Vadym Omelnytskyi's avatar Vadym Omelnytskyi
Browse files

Settings: add system setting CV_PREFERRED_INTENSITY 

Bug: 390644464
Flag: build.RELEASE_EXP
Test: verified that CV_PREFERRED_INTENSITY settings may be used
Change-Id: I0d904e03a28436d9e68964ac6c0b458b282ec564
parent 79ce7e12

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -6594,6 +6594,14 @@ public final class Settings { 
        public static final String CV_DYNAMIC_ENABLED =

                "cv_dynamic_enabled";













        /**













         * Setting to set CV preferred intensity













         * Setting should be integer (0-10)













         *













         * @hide













         */













        public static final String CV_PREFERRED_INTENSITY = "cv_preferred_intensity";



























        /**















         * Integer property that specifes the color for screen flash notification as a















         * packed 32-bit color.

































core/proto/android/providers/settings/system.proto



+2
−0




























Original line number
Diff line number
Diff line








@@ -296,6 +296,8 @@ message SystemSettingsProto {













        optional SettingProto cv_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];































        optional SettingProto cv_dynamic_enabled = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];



























        optional SettingProto cv_preferred_intensity = 3 [ (android.privacy).dest = DEST_AUTOMATIC] ;















    }















    optional Display display = 39;

















































packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -127,7 +127,8 @@ public class SystemSettings {













                Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED,















                Settings.System.PREFERRED_REGION,















                Settings.System.CV_ENABLED,













                Settings.System.CV_DYNAMIC_ENABLED













                Settings.System.CV_DYNAMIC_ENABLED,













                Settings.System.CV_PREFERRED_INTENSITY















        ));















        if (Flags.backUpSmoothDisplayAndForcePeakRefreshRate()) {















            settings.add(Settings.System.PEAK_REFRESH_RATE);

































packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -47,6 +47,9 @@ import java.util.Map;













 * Validators for System settings















 */















public class SystemSettingsValidators {













    private static final int CV_PREFERRED_INTENSITY_MIN = 0;













    private static final int CV_PREFERRED_INTENSITY_MAX = 10;





























    @UnsupportedAppUsage















    public static final Map<String, Validator> VALIDATORS = new ArrayMap<>();


























@@ -274,5 +277,9 @@ public class SystemSettingsValidators {













        VALIDATORS.put(System.PREFERRED_REGION, ANY_STRING_VALIDATOR);















        VALIDATORS.put(System.CV_ENABLED, new InclusiveIntegerRangeValidator(0, 1));















        VALIDATORS.put(System.CV_DYNAMIC_ENABLED, new InclusiveIntegerRangeValidator(0, 1));













        VALIDATORS.put(













                System.CV_PREFERRED_INTENSITY,













                new InclusiveIntegerRangeValidator(













                        CV_PREFERRED_INTENSITY_MIN, CV_PREFERRED_INTENSITY_MAX));















    }















}
























packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -3178,6 +3178,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.System.CV_DYNAMIC_ENABLED,















                SystemSettingsProto.Display.CV_DYNAMIC_ENABLED);













        dumpSetting(s, p,













                Settings.System.CV_PREFERRED_INTENSITY,













                SystemSettingsProto.Display.CV_PREFERRED_INTENSITY);















        p.end(systemDisplayToken);































        dumpSetting(s, p,