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

Commit 1d803b32 authored by Vadym Omelnytskyi's avatar Vadym Omelnytskyi Committed by Android (Google) Code Review
Browse files

Merge "EM_VALUE: add setting" into main

parents 790875c0 644b6491

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -9409,6 +9409,13 @@ public final class Settings { 
        public static final String EVEN_DIMMER_MIN_NITS =

                "even_dimmer_min_nits";













        /**













         * Setting that holds EM_VALUE (proprietary)













         *













         * @hide













         */













        public static final String EM_VALUE =













                "em_value";















        /**















         * List of the enabled print services.















         *

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -106,6 +106,7 @@ message SecureSettingsProto {













        optional SettingProto display_daltonizer_saturation_level = 58 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto accessibility_key_gesture_targets = 59 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto hct_rect_prompt_status = 60 [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto em_value = 61 [ (android.privacy).dest = DEST_AUTOMATIC ];































    }















    optional Accessibility accessibility = 2;

































core/res/res/values/config_display.xml



+4
−1




























Original line number
Diff line number
Diff line








@@ -31,5 +31,8 @@













    <bool name="config_evenDimmerEnabled">false</bool>















    <!-- Jar file path to look for PluginProvider -->















    <string name="config_pluginsProviderJarPath"/>



























    <!-- Indicate available EM_VALUE options -->













    <integer-array name="config_availableEMValueOptions">













        <item>0</item> <!-- DEFAULT -->













    </integer-array>















</resources>
























core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -1309,6 +1309,7 @@













  <java-symbol type="array" name="config_securityStatePackages" />















  <java-symbol type="array" name="stoppable_fgs_system_apps" />















  <java-symbol type="array" name="vendor_stoppable_fgs_system_apps" />













  <java-symbol type="array" name="config_availableEMValueOptions" />































  <java-symbol type="drawable" name="default_wallpaper" />















  <java-symbol type="drawable" name="default_lock_wallpaper" />

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -289,5 +289,6 @@ public class SecureSettings {













        Settings.Secure.MANDATORY_BIOMETRICS_REQUIREMENTS_SATISFIED,















        Settings.Secure.ADVANCED_PROTECTION_MODE,















        Settings.Secure.ACCESSIBILITY_KEY_GESTURE_TARGETS,













        Settings.Secure.EM_VALUE,















    };















}