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

Commit bf1d713a authored by Santos Cordon's avatar Santos Cordon
Browse files

Remove EvenDimmer Toggle 

Bug: 368500394
Flag: com.android.server.display.feature.flags.even_dimmer
Test: Manually verify toggle is gone and feature still works
Change-Id: I7ee1510acf2e17937c093187fd22d38307ed0c92
parent 82da37e4

core/java/android/provider/Settings.java

+0 −18
Original line number Diff line number Diff line
@@ -9445,24 +9445,6 @@ 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";



























        /**















         * Setting that holds EM_VALUE (proprietary)















         *

































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



+0
−7




























Original line number
Diff line number
Diff line








@@ -293,13 +293,6 @@ 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 {

































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



+0
−2




























Original line number
Diff line number
Diff line








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













        Settings.Secure.DEFAULT_NOTE_TASK_PROFILE,















        Settings.Secure.CREDENTIAL_SERVICE,















        Settings.Secure.CREDENTIAL_SERVICE_PRIMARY,













        Settings.Secure.EVEN_DIMMER_ACTIVATED,













        Settings.Secure.EVEN_DIMMER_MIN_NITS,















        Settings.Secure.STYLUS_POINTER_ICON_ENABLED,















        Settings.Secure.CAMERA_EXTENSIONS_FALLBACK,















        Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED,

































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



+0
−3




























Original line number
Diff line number
Diff line








@@ -114,9 +114,6 @@ 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



+0
−9




























Original line number
Diff line number
Diff line








@@ -2183,15 +2183,6 @@ 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);





























        dumpSetting(s, p,















                Settings.Secure.EM_VALUE,















                SecureSettingsProto.Accessibility.EM_VALUE);