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

Merge "Add gesture settings to system settings provider"

Browse Source
This commit is contained in:
Yeabkal Assegid Wubshit
2021-07-27 01:44:15 +00:00
committed by Android (Google) Code Review
parent fc9ae6314b 1253d56f26
commit 8a9215e20f
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16701,6 +16701,18 @@ public final class Settings {
* @hide
*/
public static final String OEM_SETUP_VERSION = "oem_setup_version";
/**
* Controls the gestures feature.
* @hide
*/
public static final String MASTER_GESTURES_ENABLED = "master_gestures_enabled";
/**
* Whether or not ungaze is enabled.
* @hide
*/
public static final String UNGAZE_ENABLED = "ungaze_enabled";
}
}

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

@@ -294,6 +294,8 @@ public class GlobalSettingsValidators {
VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR);
VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.OEM_SETUP_VERSION, ANY_INTEGER_VALIDATOR);
VALIDATORS.put(Global.Wearable.MASTER_GESTURES_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.UNGAZE_ENABLED, BOOLEAN_VALIDATOR);
}
}

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

@@ -654,7 +654,9 @@ public class SettingsBackupTest {
Settings.Global.Wearable.COMPANION_OS_VERSION,
Settings.Global.Wearable.ENABLE_ALL_LANGUAGES,
Settings.Global.Wearable.SETUP_LOCALE,
Settings.Global.Wearable.OEM_SETUP_VERSION);
Settings.Global.Wearable.OEM_SETUP_VERSION,
Settings.Global.Wearable.MASTER_GESTURES_ENABLED,
Settings.Global.Wearable.UNGAZE_ENABLED);
private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
newHashSet(