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

Commit 0a134828 authored by Bagus Maulana's avatar Bagus Maulana Committed by Android (Google) Code Review
Browse files

Merge "Back up vibration watch settings" into main

parents 2207526e b831bbe9

packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -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,

    };

}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −3
Original line number Diff line number Diff line
@@ -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,