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

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

Merge "Backup ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER"

parents 851d77b2 63b93200

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

+2 −1
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public class GlobalSettings { 
        Settings.Global.Wearable.AMBIENT_TOUCH_TO_WAKE,

        Settings.Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE,

        Settings.Global.Wearable.BATTERY_SAVER_MODE,

        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS

        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,

        Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER

    };

}

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+3 −0
Original line number Diff line number Diff line
@@ -307,6 +307,9 @@ public class GlobalSettingsValidators { 
        VALIDATORS.put(

                Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,

                NON_NEGATIVE_INTEGER_VALIDATOR);

        VALIDATORS.put(

                Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,

                BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.Wearable.BURN_IN_PROTECTION_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.Wearable.COMBINED_LOCATION_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Global.Wearable.WRIST_ORIENTATION_MODE,

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

+0 −1
Original line number Diff line number Diff line
@@ -652,7 +652,6 @@ public class SettingsBackupTest { 
                    Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE,

                    Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY,

                    Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED,

                    Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,

                    Settings.Global.Wearable.WET_MODE_ON,

                    Settings.Global.Wearable.COOLDOWN_MODE_ON,

                    Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,