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

Merge "Add global settings keys for sysui package and main activity"

Browse Source
This commit is contained in:
Haiping Yang
2021-05-11 02:33:46 +00:00
committed by Android (Google) Code Review
parent 547d8d638c 41d20af652
commit edbaedf568
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14756,6 +14756,22 @@ public final class Settings {
public static final String MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY =
"max_sound_trigger_detection_service_ops_per_day";
/**
* Setting indicating the name of the Wear OS app package containing the device's sysui.
*
* @hide
*/
public static final String CLOCKWORK_SYSUI_PACKAGE_NAME =
"clockwork_sysui_package_name";
/**
* Setting indicating the name of the main activity of the Wear OS sysui.
*
* @hide
*/
public static final String CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME =
"clockwork_sysui_main_activity_name";
/**
* Indicates whether aware is available in the current location.
* @hide

2
packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java
View File

@@ -40,6 +40,8 @@ public class GlobalSettings {
public static final String[] SETTINGS_TO_BACKUP = {
Settings.Global.APPLY_RAMPING_RINGER,
Settings.Global.BUGREPORT_IN_POWER_MENU,
Settings.Global.CLOCKWORK_SYSUI_PACKAGE_NAME,
Settings.Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME,
Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
Settings.Global.APP_AUTO_RESTRICTION_ENABLED,
Settings.Global.AUTO_TIME,

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

@@ -113,6 +113,8 @@ public class GlobalSettingsValidators {
VALIDATORS.put(
Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, PERCENTAGE_INTEGER_VALIDATOR);
VALIDATORS.put(Global.BLUETOOTH_ON, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME, ANY_STRING_VALIDATOR);
VALIDATORS.put(Global.CLOCKWORK_SYSUI_PACKAGE_NAME, ANY_STRING_VALIDATOR);
VALIDATORS.put(Global.PRIVATE_DNS_MODE, ANY_STRING_VALIDATOR);
VALIDATORS.put(Global.PRIVATE_DNS_SPECIFIER, ANY_STRING_VALIDATOR);
VALIDATORS.put(Global.SOFT_AP_TIMEOUT_ENABLED, BOOLEAN_VALIDATOR);