Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Settings Key for Wearable Bedtime Mode"

Browse Source
This commit is contained in:
Yeabkal Wubshit
2022-05-19 17:53:59 +00:00
committed by Android (Google) Code Review
parent 6d929fbac8 27d12ec8a5
commit 339771ab1a
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -17410,6 +17410,12 @@ public final class Settings {
*/
public static final String TOUCH_AND_HOLD_WATCH_FACE = "touch_and_hold_watchface";
/**
* Whether bedtime mode is enabled.
* @hide
*/
public static final String BEDTIME_MODE = "bedtime_mode";
/**
* Whether the current watchface is decomposable.
* @hide

1
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -322,6 +322,7 @@ public class GlobalSettingsValidators {
VALIDATORS.put(Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR);
}
}

3
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -655,7 +655,8 @@ public class SettingsBackupTest {
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.SCREEN_UNLOCK_SOUND_ENABLED,
Settings.Global.Wearable.BEDTIME_MODE);
private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
newHashSet(