diff options
| author | 2024-03-06 12:39:36 +0000 | |
|---|---|---|
| committer | 2024-03-06 12:39:36 +0000 | |
| commit | 0a134828631cbe46482a6ab2cef00562cfa9352c (patch) | |
| tree | 0d57e6ba4a49372747e38d1ac7c3fcb4a14e4d51 | |
| parent | 2207526ee30a57eaeba68cb6df3e047c37b651f6 (diff) | |
| parent | b831bbe99b89708f26301555a846dedc1ba01334 (diff) | |
Merge "Back up vibration watch settings" into main
| -rw-r--r-- | packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index add313419c7d..3043d54b3025 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -116,5 +116,8 @@ public class GlobalSettings { Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED, Settings.Global.Wearable.WRIST_DETECTION_AUTO_LOCKING_ENABLED, Settings.Global.FORCE_ENABLE_PSS_PROFILING, + Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED, + Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE, + Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED, }; } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 28cdc6db192b..09d076ee9c26 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -626,9 +626,6 @@ public class SettingsBackupTest { Settings.Global.Wearable.BEDTIME_MODE, Settings.Global.Wearable.BEDTIME_HARD_MODE, Settings.Global.Wearable.LOCK_SCREEN_STATE, - Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED, - Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE, - Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED, Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED, Settings.Global.Wearable.NETWORK_LOCATION_OPT_IN, Settings.Global.Wearable.CUSTOM_COLOR_FOREGROUND, |