Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 351aa3a9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add ActiveUnlock Settings" into tm-dev am: e6c8903e am:... 

Merge "Merge "Add ActiveUnlock Settings" into tm-dev am: e6c8903e am: 06c4607d" into tm-d1-dev-plus-aosp am: d7b35329 am: a2f30fb8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030064



Change-Id: I0f0bc8e49d775bd9721e43f9a9029ca51ca08004
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b6b7b64 a2f30fb8

core/java/android/provider/Settings.java

+20 −0
Original line number Diff line number Diff line
@@ -9688,6 +9688,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.















         *

































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -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,

































packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -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);