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

Commit 9a71a3ec authored by chengfeitao's avatar chengfeitao
Browse files

SettingsGoogle: Add ContextualScreenTimeout 

Store contextual screen timeout preference when the
corresponding switch is toggled.

Bug: 295232527

Test: atest ExternalSettingsProviderTest
Test: atest ContextualTimeoutPreferenceControllerTest
Change-Id: Ib3707e5e47f10f36d4e1d807a9977dacaaa894a5
parent e15927a4

core/java/android/provider/Settings.java

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

                "extra_automatic_power_save_mode";













        /**













         * Whether contextual screen timeout is enabled.













         *













         * @hide













         */













        public static final String CONTEXTUAL_SCREEN_TIMEOUT_ENABLED =













                "contextual_screen_timeout_enabled";



























        /**















         * Whether lockscreen weather is enabled.















         *

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -243,6 +243,7 @@ public class SecureSettings {













        Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME,















        Settings.Secure.CUSTOM_BUGREPORT_HANDLER_APP,















        Settings.Secure.CUSTOM_BUGREPORT_HANDLER_USER,













        Settings.Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED,















        Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED,















        Settings.Secure.HEARING_AID_RINGTONE_ROUTING,















        Settings.Secure.HEARING_AID_CALL_ROUTING,

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -390,6 +390,7 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_APP, ANY_STRING_VALIDATOR);















        VALIDATORS.put(Secure.CUSTOM_BUGREPORT_HANDLER_USER, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.HEARING_AID_RINGTONE_ROUTING,















                new DiscreteValueValidator(new String[] {"0", "1", "2"}));















        VALIDATORS.put(Secure.HEARING_AID_CALL_ROUTING,