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

Commit fb09aba2 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by android-build-merger
Browse files

Merge "Added new string." into qt-qpr1-dev am: 262f5fe9

am: b288f07b

Change-Id: Ia15b1cfceaf405d15ad6dc9e10acdd18b11e870e
parents 527a4353 b288f07b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -909,6 +909,8 @@
    <string name="security_settings_face_enroll_introduction_no_thanks">No thanks</string>
    <!-- Button text to start enrollment [CHAR LIMIT=30] -->
    <string name="security_settings_face_enroll_introduction_agree">Agree</string>
    <!-- Button text to scroll to the end of a scrollview. [CHAR LIMIT=30] -->
    <string name="security_settings_face_enroll_introduction_more">More</string>
    <!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->
    <string name="security_settings_face_enroll_introduction_title">Unlock with your face</string>
    <!-- Introduction title shown in face enrollment to introduce the face unlock feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->
+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
            final RequireScrollMixin requireScrollMixin = getLayout().getMixin(
                    RequireScrollMixin.class);
            requireScrollMixin.requireScrollWithButton(this, agreeButton,
                    R.string.wifi_more,
                    R.string.security_settings_face_enroll_introduction_more,
                    button -> {
                        onNextButtonClick(button);
                    });