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

Commit ec589193 authored by Joshua Mccloskey's avatar Joshua Mccloskey
Browse files

Updated UDFPS strings. 

Test: Manual.
Fixes: 226490774
Change-Id: I6aeed72ab87e9b8b937f1acda12499c9af87462c
parent c397470a

res/drawable/ic_guarantee.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2022 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M12.24 13L9.41 10.17L8 11.59L10.83 14.42C11.61 15.2 12.88 15.2 13.66 14.42L19.42 8.66C19.79 8.28 20 7.77 20 7.24V5.5C20 4.4 19.1 3.5 18 3.5H6C4.9 3.5 4 4.4 4 5.5V12.73C4 16.99 7.22 20.71 11.47 20.99C16.13 21.28 20 17.59 20 13H18C18 16.57 14.87 19.42 11.21 18.95C8.19 18.56 6 15.84 6 12.79V5.5H18V7.24L12.24 13Z"

        android:fillColor="#5F6368"

        android:fillType="evenOdd"/>

</vector>
 
 No newline at end of file

res/layout/fingerprint_enroll_introduction.xml

+21 −0
Original line number Diff line number Diff line
@@ -165,6 +165,27 @@ 
                    style="@style/BiometricEnrollIntroMessage" />

            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal">



                <ImageView

                    android:id="@+id/icon_shield"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@null"

                    android:src="@drawable/ic_guarantee"/>

                <Space

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/footer_message_6"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/BiometricEnrollIntroMessage" />

            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -1009,6 +1009,10 @@ 
    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5">Your phone can be unlocked when you don\u2019t intend to, like if someone holds it up to your finger.</string>

    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5">Your child\u2019s phone can be unlocked when they don\u2019t intend to, like if someone holds it up to their finger.</string>

    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6">For best results, use a screen protector that\u2019s Made for Google certified. With other screen protectors, your fingerprint may not work.</string>

    <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE] -->

    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6">For best results, use a screen protector that\u2019s Made for Google certified. With other screen protectors, your child\u2019s fingerprint may not work.</string>

    <!-- Introduction detail message shown in fingerprint enrollment introduction to learn more about fingerprint [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more"></string>








@@ -1120,8 +1124,10 @@







    <string name="security_settings_udfps_enroll_repeat_message">Touch &amp; hold each time the fingerprint icon moves. This helps capture more of your fingerprint.</string>









    <!-- Title shown during fingerprint enrollment that instructs the user to enroll their fingertip [CHAR LIMIT=80] -->









    <string name="security_settings_udfps_enroll_fingertip_title">Place the tip of your finger on the sensor</string>









    <!-- Title shown during fingerprint enrollment that instructs the user to enroll the edges of their finger [CHAR LIMIT=80] -->









    <string name="security_settings_udfps_enroll_edge_title">Finally, use the edges of your finger</string>









    <!-- Title shown during fingerprint enrollment that instructs the user to enroll the left edge of their finger [CHAR LIMIT=80] -->









    <string name="security_settings_udfps_enroll_left_edge_title">Place the left edge of your finger</string>









    <!-- Title shown during fingerprint enrollment that instructs the user to enroll the right edge of their finger [CHAR LIMIT=80] -->









    <string name="security_settings_udfps_enroll_right_edge_title">Place the right edge of your finger</string>









    <!-- Message shown during fingerprint enrollment that instructs the user to enroll the edges of their finger [CHAR LIMIT=160] -->









    <string name="security_settings_udfps_enroll_edge_message">Place the side of your fingerprint on the sensor and hold, then switch to the other side</string>









    <!-- Message shown in fingerprint enrollment asking users to repeat touching the fingerprint sensor. [CHAR LIMIT=160] -->

























src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -376,7 +376,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {







                break;



















            case STAGE_LEFT_EDGE:









                setHeaderText(R.string.security_settings_udfps_enroll_edge_title);









                setHeaderText(R.string.security_settings_udfps_enroll_left_edge_title);









                if (!mHaveShownUdfpsLeftEdgeLottie && mIllustrationLottie != null) {









                    mHaveShownUdfpsLeftEdgeLottie = true;









                    setDescriptionText("");








@@ -395,7 +395,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {







                }









                break;









            case STAGE_RIGHT_EDGE:









                setHeaderText(R.string.security_settings_udfps_enroll_edge_title);









                setHeaderText(R.string.security_settings_udfps_enroll_right_edge_title);









                if (!mHaveShownUdfpsRightEdgeLottie && mIllustrationLottie != null) {









                    mHaveShownUdfpsRightEdgeLottie = true;









                    setDescriptionText("");
































src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java



+7
−0






























Original line number
Diff line number
Diff line







@@ -91,10 +91,12 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {







        final TextView footerMessage3 = findViewById(R.id.footer_message_3);









        final TextView footerMessage4 = findViewById(R.id.footer_message_4);









        final TextView footerMessage5 = findViewById(R.id.footer_message_5);









        final TextView footerMessage6 = findViewById(R.id.footer_message_6);









        footerMessage2.setText(getFooterMessage2());









        footerMessage3.setText(getFooterMessage3());









        footerMessage4.setText(getFooterMessage4());









        footerMessage5.setText(getFooterMessage5());









        footerMessage6.setText(getFooterMessage6());



















        final TextView footerTitle1 = findViewById(R.id.footer_title_1);









        final TextView footerTitle2 = findViewById(R.id.footer_title_2);








@@ -163,6 +165,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {







        return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_5;









    }



















    @StringRes









    protected int getFooterMessage6() {









        return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_6;









    }



















    @Override









    protected boolean isDisabledByAdmin() {









        return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(