Merge "Add global settings keys for sysui package and main activity" (edbaedf5) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -14756,6 +14756,22 @@ public final class Settings {
		public static final String MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY =
		"max_sound_trigger_detection_service_ops_per_day";

		/**
		* Setting indicating the name of the Wear OS app package containing the device's sysui.
		*
		* @hide
		*/
		public static final String CLOCKWORK_SYSUI_PACKAGE_NAME =
		"clockwork_sysui_package_name";

		/**
		* Setting indicating the name of the main activity of the Wear OS sysui.
		*
		* @hide
		*/
		public static final String CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME =
		"clockwork_sysui_main_activity_name";

		/**
		* Indicates whether aware is available in the current location.
		* @hide

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ public class GlobalSettings {
		public static final String[] SETTINGS_TO_BACKUP = {
		Settings.Global.APPLY_RAMPING_RINGER,
		Settings.Global.BUGREPORT_IN_POWER_MENU,
		Settings.Global.CLOCKWORK_SYSUI_PACKAGE_NAME,
		Settings.Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME,
		Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
		Settings.Global.APP_AUTO_RESTRICTION_ENABLED,
		Settings.Global.AUTO_TIME,

+2 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,8 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(
		Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, PERCENTAGE_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.BLUETOOTH_ON, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.CLOCKWORK_SYSUI_PACKAGE_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.PRIVATE_DNS_MODE, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.PRIVATE_DNS_SPECIFIER, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.SOFT_AP_TIMEOUT_ENABLED, BOOLEAN_VALIDATOR);