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

Commit 10ccb0b9 authored by Joshua McCloskey's avatar Joshua McCloskey Committed by Automerger Merge Worker
Browse files

Added face unicorn strings am: 66211d15 am: 909913ff am: 4be235f6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254



Change-Id: Icc08826d46790ba67c0db63f3afa5e4ca1232467
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2cbfafb 4be235f6

res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -813,6 +813,12 @@ 
    <!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>

    <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_consent_message_0" product="default">Allow your child to use their face to unlock their phone</string>

    <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet">Allow your child to use their face to unlock their tablet</string>

    <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_consent_message_0" product="device">Allow your child to use their face to unlock their device</string>

    <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_consent_message" product="default">Using your child\u2019s face to unlock their phone may be less secure than a strong pattern or PIN.</string>

    <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_consent_message" product="tablet">Using your child\u2019s face to unlock their tablet may be less secure than a strong pattern or PIN.</string>
@@ -833,6 +839,8 @@ 
    <!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock when asking for parental consent. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_consent_looking"></string>

    <!-- Message on the face enrollment introduction page that provides information about the relative security of face for unlocking the phone. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_consent_less_secure"></string>

    <!-- Message on the face enrollment introduction page that provides information about the relative security of face for unlocking the phone for parental consent. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_less_secure"></string>

    <!-- Message on the face enrollment introduction page that provides information about how to require eyes to be open for Face Unlock. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_gaze"></string>

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

+7 −0
Original line number Diff line number Diff line
@@ -115,11 +115,13 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
        final TextView howMessage = findViewById(R.id.how_message);

        final TextView inControlTitle = findViewById(R.id.title_in_control);

        final TextView inControlMessage = findViewById(R.id.message_in_control);

        final TextView lessSecure = findViewById(R.id.info_message_less_secure);

        infoMessageGlasses.setText(getInfoMessageGlasses());

        infoMessageLooking.setText(getInfoMessageLooking());

        inControlTitle.setText(getInControlTitle());

        howMessage.setText(getHowMessage());

        inControlMessage.setText(getInControlMessage());

        lessSecure.setText(getLessSecureMessage());



        // Set up and show the "less secure" info section if necessary.

        if (getResources().getBoolean(R.bool.config_face_intro_show_less_secure)) {
@@ -227,6 +229,11 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
        return R.string.security_settings_face_enroll_introduction_control_message;

    }



    @StringRes

    protected int getLessSecureMessage() {

        return R.string.security_settings_face_enroll_introduction_info_less_secure;

    }



    @Override

    protected boolean isDisabledByAdmin() {

        return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(

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

+13 −3
Original line number Diff line number Diff line
@@ -45,14 +45,19 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction { 
            R.string.security_settings_face_enroll_introduction_info_consent_gaze,

            R.string.security_settings_face_enroll_introduction_how_consent_message,

            R.string.security_settings_face_enroll_introduction_control_consent_title,

            R.string.security_settings_face_enroll_introduction_control_consent_message

            R.string.security_settings_face_enroll_introduction_control_consent_message,

            R.string.security_settings_face_enroll_introduction_consent_message_0,

            R.string.security_settings_face_enroll_introduction_info_consent_less_secure

    };



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        setDescriptionText(R.string.security_settings_face_enroll_introduction_consent_message);

        final String text =

                getText(R.string.security_settings_face_enroll_introduction_consent_message_0)

                + "\n\n"

                + getText(R.string.security_settings_face_enroll_introduction_consent_message);

        setDescriptionText(text);

    }



    @Override
@@ -134,6 +139,11 @@ public class FaceEnrollParentalConsent extends FaceEnrollIntroduction { 
        return R.string.security_settings_face_enroll_consent_introduction_title;

    }



    @Override

    protected int getLessSecureMessage() {

        return R.string.security_settings_face_enroll_introduction_info_consent_less_secure;

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.FACE_PARENTAL_CONSENT;