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

Commit 0ea0471b authored Feb 13, 2024 by Chengfei Tao Committed by Android (Google) Code Review Feb 13, 2024

Merge "SettingsGoogle: Add ContextualScreenTimeout" into main

parents 2ad05399 9a71a3ec

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -12285,6 +12285,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
		@@ -247,6 +247,7 @@ public class SecureSettings {
		Settings.Secure.BLUETOOTH_LE_BROADCAST_FALLBACK_ACTIVE_DEVICE_ADDRESS,
		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
		@@ -397,6 +397,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,