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

Commit a3884bd3 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Added face education setting" into qt-dev 

am: c03c8909

Change-Id: I809f8d309e3a920eb82b0295d996a07196a95e80
parents f8b9f964 c03c8909

core/java/android/provider/Settings.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -8272,6 +8272,16 @@ public final class Settings { 
        private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =

        private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =

                BOOLEAN_VALIDATOR;

                BOOLEAN_VALIDATOR;




















        /**














         * Whether or not the face unlock education screen has been shown to the user.














         * @hide














         */














        public static final String FACE_UNLOCK_EDUCATION_INFO_DISPLAYED =














                "face_unlock_education_info_displayed";



























        private static final Validator FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR =














                BOOLEAN_VALIDATOR;
























        /**







        /**











         * Whether or not debugging is enabled.







         * Whether or not debugging is enabled.











         * @hide







         * @hide










@@ -9079,6 +9089,8 @@ public final class Settings {









            VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);







            VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);











            VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,







            VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,











                    FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);







                    FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);














            VALIDATORS.put(FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,














                    FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR);











            VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);







            VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);











            VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,







            VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,











                    ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);







                    ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -721,7 +721,8 @@ public class SettingsBackupTest {









                 Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,







                 Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,











                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,







                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,











                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,







                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,











                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED);







                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,














                 Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED);































    @Test







    @Test











    public void systemSettingsBackedUpOrBlacklisted() {







    public void systemSettingsBackedUpOrBlacklisted() {