Merge "Add a Setting for Wearable System Status Tray Configuration" into main (fe25ea1a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -20454,6 +20454,29 @@ public final class Settings {
		* @hide
		*/
		public static final String AUTO_BEDTIME_MODE = "auto_bedtime_mode";

		/**
		* Indicates that all elements of the system status tray on wear should be rendered
		* by default wear system.
		*
		* @hide
		*/
		public static final int STATUS_TRAY_CONFIGURATION_DEFAULT = 0;

		/**
		* Indicates that all elements of the system status tray on wear should be hidden.
		*
		* @hide
		*/
		public static final int STATUS_TRAY_CONFIGURATION_SYSTEM_HIDDEN = 1;

		/**
		* Configuration of system status tray in wear.
		*
		* @hide
		*/
		public static final String WEAR_SYSTEM_STATUS_TRAY_CONFIGURATION =
		"wear_system_status_tray_configuration";
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -464,5 +464,14 @@ public class GlobalSettingsValidators {
		));
		VALIDATORS.put(Global.HEARING_DEVICE_LOCAL_AMBIENT_VOLUME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.HEARING_DEVICE_LOCAL_NOTIFICATION, ANY_STRING_VALIDATOR);
		VALIDATORS.put(
		Global.Wearable.WEAR_SYSTEM_STATUS_TRAY_CONFIGURATION,
		new DiscreteValueValidator(
		new String[] {
		String.valueOf(
		Global.Wearable.STATUS_TRAY_CONFIGURATION_DEFAULT),
		String.valueOf(
		Global.Wearable.STATUS_TRAY_CONFIGURATION_SYSTEM_HIDDEN)
		}));
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -635,7 +635,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE,
		Settings.Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED,
		Settings.Global.Wearable.CONNECTIVITY_KEEP_DATA_ON,
		Settings.Global.Wearable.PHONE_SWITCHING_REQUEST_SOURCE);
		Settings.Global.Wearable.PHONE_SWITCHING_REQUEST_SOURCE,
		Settings.Global.Wearable.WEAR_SYSTEM_STATUS_TRAY_CONFIGURATION);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(