diff options
| author | 2024-11-18 23:12:12 +0000 | |
|---|---|---|
| committer | 2024-11-18 23:12:12 +0000 | |
| commit | fe25ea1a153bbee2b496d76c36a4de3433d64df4 (patch) | |
| tree | fee9b1b92cfaa344dba3dc3eeb2f74f27d740dc4 | |
| parent | 007140f02daa40ac9f800be4b1c9ad1a816d8386 (diff) | |
| parent | 61eafe84617f2171c0faa74c03f5ae69f072342d (diff) | |
Merge "Add a Setting for Wearable System Status Tray Configuration" into main
3 files changed, 34 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a35c9c1cd4ec..19b0c6fcdd77 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index c90ba8249d54..32d4580f67ec 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -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) + })); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 9de7faf04df6..a62b7fd3db81 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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( |