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

Commit ce21b90e authored Jul 26, 2024 by Chengfei Tao Committed by Android (Google) Code Review Jul 26, 2024

Merge "New setting for hinge angle lidevent" into main

parents bd11bbb6 dea7f66b

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -12559,6 +12559,14 @@ public final class Settings {
		public static final String CONTEXTUAL_SCREEN_TIMEOUT_ENABLED =
		"contextual_screen_timeout_enabled";

		/**
		* Whether hinge angle lidevent is enabled.
		*
		* @hide
		*/
		public static final String HINGE_ANGLE_LIDEVENT_ENABLED =
		"hinge_angle_lidevent_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
		@@ -253,6 +253,7 @@ public class SecureSettings {
		Settings.Secure.CUSTOM_BUGREPORT_HANDLER_APP,
		Settings.Secure.CUSTOM_BUGREPORT_HANDLER_USER,
		Settings.Secure.CONTEXTUAL_SCREEN_TIMEOUT_ENABLED,
		Settings.Secure.HINGE_ANGLE_LIDEVENT_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
		@@ -406,6 +406,7 @@ public class SecureSettingsValidators {
		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.HINGE_ANGLE_LIDEVENT_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.HEARING_AID_RINGTONE_ROUTING,
		new DiscreteValueValidator(new String[] {"0", "1", "2"}));
		VALIDATORS.put(Secure.HEARING_AID_CALL_ROUTING,