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

Commit 14ea4698 authored by Bagus Maulana's avatar Bagus Maulana
Browse files

Merge "Update SETTINGS_TO_BACKUP list for Wear OS 4" into tm-wear-kr3-dev am: 53d1d633d2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24432427



Bug: 297210547
Change-Id: I94bae3e0c42f163908984cb4e543f189c5675fd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit 38e77ca34dba27d419b16262fa59ec0875e2cb7f)
parent d8ab42c8

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

+5 −0
Original line number Diff line number Diff line
@@ -106,5 +106,10 @@ public class GlobalSettings { 
        Settings.Global.Wearable.RTL_SWIPE_TO_DISMISS_ENABLED_DEV,

        Settings.Global.Wearable.REDUCE_MOTION,

        Settings.Global.Wearable.WEAR_LAUNCHER_UI_MODE,

        Settings.Global.Wearable.USER_HFP_CLIENT_SETTING,

        Settings.Global.Wearable.RSB_WAKE_ENABLED,

        Settings.Global.Wearable.SCREENSHOT_ENABLED,

        Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED,

        Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,

    };

}

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

+0 −5
Original line number Diff line number Diff line
@@ -658,7 +658,6 @@ public class SettingsBackupTest { 
                    Settings.Global.Wearable.COMPANION_BLE_ROLE,

                    Settings.Global.Wearable.COMPANION_NAME,

                    Settings.Global.Wearable.COMPANION_APP_NAME,

                    Settings.Global.Wearable.USER_HFP_CLIENT_SETTING,

                    Settings.Global.Wearable.COMPANION_OS_VERSION,

                    Settings.Global.Wearable.ENABLE_ALL_LANGUAGES,

                    Settings.Global.Wearable.SETUP_LOCALE,
@@ -673,16 +672,12 @@ public class SettingsBackupTest { 
                    Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED,

                    Settings.Global.Wearable.WET_MODE_ON,

                    Settings.Global.Wearable.COOLDOWN_MODE_ON,

                    Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,

                    Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED,

                    Settings.Global.Wearable.BEDTIME_MODE,

                    Settings.Global.Wearable.BEDTIME_HARD_MODE,

                    Settings.Global.Wearable.RSB_WAKE_ENABLED,

                    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.SCREENSHOT_ENABLED,

                    Settings.Global.Wearable.DISABLE_AOD_WHILE_PLUGGED,

                    Settings.Global.Wearable.NETWORK_LOCATION_OPT_IN,

                    Settings.Global.Wearable.CUSTOM_COLOR_FOREGROUND,