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

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

Merge "Modified text to cancel enrollment" into qt-r1-dev 

am: fde49ec3

Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
parents 3a8baab5 fde49ec3

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -910,6 +910,10 @@ 
    <string name="security_settings_face_enroll_introduction_accessibility_vision"></string>

    <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->

    <string name="security_settings_face_enroll_introduction_cancel">Cancel</string>

    <!-- Button text to cancel enrollment [CHAR LIMIT=30] -->

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

    <!-- 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] -->

src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java

+10 −20
Original line number Diff line number Diff line
@@ -47,29 +47,19 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
        mFaceManager = Utils.getFaceManagerOrNull(this);



        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);

        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {

            mFooterBarMixin.setSecondaryButton(

                    new FooterButton.Builder(this)

                            .setText(R.string.skip_label)

                            .setListener(this::onSkipButtonClick)

                            .setButtonType(FooterButton.ButtonType.SKIP)

                            .setTheme(R.style.SudGlifButton_Secondary)

                            .build()

            );

        } else {



        mFooterBarMixin.setSecondaryButton(

                new FooterButton.Builder(this)

                            .setText(R.string.security_settings_face_enroll_introduction_cancel)

                        .setText(R.string.security_settings_face_enroll_introduction_no_thanks)

                        .setListener(this::onCancelButtonClick)

                        .setButtonType(FooterButton.ButtonType.CANCEL)

                        .setTheme(R.style.SudGlifButton_Secondary)

                        .build()

        );

        }



        mFooterBarMixin.setPrimaryButton(

                new FooterButton.Builder(this)

                        .setText(R.string.wizard_next)

                        .setText(R.string.security_settings_face_enroll_introduction_agree)

                        .setListener(this::onNextButtonClick)

                        .setButtonType(FooterButton.ButtonType.NEXT)

                        .setTheme(R.style.SudGlifButton_Primary)