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

Merge "Add ActiveUnlock Settings" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-29 17:02:57 +00:00
committed by Android (Google) Code Review
parent dcbd27d361 1dbc30a437
commit e6c8903e65
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9681,6 +9681,26 @@ public final class Settings {
@Readable
public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";
/**
* Whether or not active unlock triggers on wake.
* @hide
*/
public static final String ACTIVE_UNLOCK_ON_WAKE = "active_unlock_on_wake";
/**
* Whether or not active unlock triggers on unlock intent.
* @hide
*/
public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT =
"active_unlock_on_unlock_intent";
/**
* Whether or not active unlock triggers on biometric failure.
* @hide
*/
public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =
"active_unlock_on_biometric_fail";
/**
* Whether the assist gesture should be enabled.
*

3
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -117,6 +117,9 @@ public class SecureSettings {
Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD,
Settings.Secure.FACE_UNLOCK_APP_ENABLED,
Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
Settings.Secure.ACTIVE_UNLOCK_ON_WAKE,
Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT,
Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL,
Settings.Secure.VR_DISPLAY_MODE,
Settings.Secure.NOTIFICATION_BADGING,
Settings.Secure.NOTIFICATION_DISMISS_RTL,

3
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -173,6 +173,9 @@ public class SecureSettingsValidators {
VALIDATORS.put(Secure.SHOW_MEDIA_WHEN_BYPASSING, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.FACE_UNLOCK_APP_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_WAKE, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ASSIST_GESTURE_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ASSIST_GESTURE_WAKE_ENABLED, BOOLEAN_VALIDATOR);