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

Merge "Adding new setting to communicate BTHM state to KeyGuard."

Browse Source
This commit is contained in:
Matthew Small
2022-10-17 16:04:53 +00:00
committed by Android (Google) Code Review
parent 1918e09831 7568883122
commit 6779234178
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17600,6 +17600,11 @@ public final class Settings {
*/
public static final String BEDTIME_MODE = "bedtime_mode";
/**
* Whether hard bedtime mode is active thus limiting user interactions.
*/
public static final String BEDTIME_HARD_MODE = "bedtime_hard_mode";
/**
* Whether the current watchface is decomposable.
* @hide

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

@@ -336,6 +336,7 @@ public class GlobalSettingsValidators {
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);
VALIDATORS.put(Global.Wearable.BEDTIME_HARD_MODE, BOOLEAN_VALIDATOR);
VALIDATORS.put(
Global.Wearable.EARLY_UPDATES_STATUS,
new DiscreteValueValidator(
@@ -348,4 +349,3 @@ public class GlobalSettingsValidators {
}));
}
}

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

@@ -657,6 +657,7 @@ public class SettingsBackupTest {
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.EARLY_UPDATES_STATUS);
private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =