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

Commit 85cce763 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Create MinBrightnessClamper 

- Create structure of min brightness clamper
- Create lower brightness activated setting
- Create lower brightness nits setting

Bug: 179428400
Test: manual
Change-Id: I673399d19f7ff88794cfb1a83ee208c72895fd75
parent aa126d7a

core/java/android/provider/Settings.java

+18 −0
Original line number Diff line number Diff line
@@ -8844,6 +8844,24 @@ public final class Settings { 
        public static final String REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS =

                "reduce_bright_colors_persist_across_reboots";













        /**













         * Setting that specifies whether Even Dimmer - a feature that allows the brightness













         * slider to go below what the display can conventionally do, should be enabled.













         *













         * @hide













         */













        public static final String EVEN_DIMMER_ACTIVATED =













                "even_dimmer_activated";

























        /**













         * Setting that specifies which nits level Even Dimmer should allow the screen brightness













         * to go down to.













         *













         * @hide













         */













        public static final String EVEN_DIMMER_MIN_NITS =













                "even_dimmer_min_nits";



























        /**















         * List of the enabled print services.















         *

































core/proto/android/providers/settings/secure.proto



+8
−1




























Original line number
Diff line number
Diff line








@@ -268,6 +268,13 @@ message SecureSettingsProto {





























    optional SettingProto enhanced_voice_privacy_enabled = 23 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    message EvenDimmer {













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













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













    }



























    optional EvenDimmer even_dimmer = 98;





























    optional SettingProto font_weight_adjustment = 85 [ (android.privacy).dest = DEST_AUTOMATIC ];































    message Gesture {










@@ -712,5 +719,5 @@ message SecureSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 98;













    // Next tag = 99;















}
























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



+3
−1




























Original line number
Diff line number
Diff line








@@ -251,6 +251,8 @@ public class SecureSettings {













        Settings.Secure.STYLUS_HANDWRITING_ENABLED,















        Settings.Secure.DEFAULT_NOTE_TASK_PROFILE,















        Settings.Secure.CREDENTIAL_SERVICE,













        Settings.Secure.CREDENTIAL_SERVICE_PRIMARY













        Settings.Secure.CREDENTIAL_SERVICE_PRIMARY,













        Settings.Secure.EVEN_DIMMER_ACTIVATED,













        Settings.Secure.EVEN_DIMMER_MIN_NITS















    };















}
























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



+3
−0




























Original line number
Diff line number
Diff line








@@ -110,6 +110,9 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.FONT_WEIGHT_ADJUSTMENT, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.REDUCE_BRIGHT_COLORS_LEVEL, PERCENTAGE_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.EVEN_DIMMER_ACTIVATED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.EVEN_DIMMER_MIN_NITS,













                new InclusiveFloatRangeValidator(0.0f, Float.MAX_VALUE));















        VALIDATORS.put(Secure.TTS_DEFAULT_RATE, NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.TTS_DEFAULT_PITCH, NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.TTS_DEFAULT_SYNTH, PACKAGE_NAME_VALIDATOR);

































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



+9
−0




























Original line number
Diff line number
Diff line








@@ -2135,6 +2135,15 @@ class SettingsProtoDumpUtil {













                Settings.Secure.ENHANCED_VOICE_PRIVACY_ENABLED,















                SecureSettingsProto.ENHANCED_VOICE_PRIVACY_ENABLED);





























        final long evenDimmerToken = p.start(SecureSettingsProto.EVEN_DIMMER);













        dumpSetting(s, p,













                Settings.Secure.EVEN_DIMMER_ACTIVATED,













                SecureSettingsProto.EvenDimmer.EVEN_DIMMER_ACTIVATED);













        dumpSetting(s, p,













                Settings.Secure.EVEN_DIMMER_MIN_NITS,













                SecureSettingsProto.EvenDimmer.EVEN_DIMMER_MIN_NITS);













        p.end(evenDimmerToken);





























        final long gestureToken = p.start(SecureSettingsProto.GESTURE);















        dumpSetting(s, p,















                Settings.Secure.AWARE_ENABLED,