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

Commit 1726b2c9 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev

parents 96a06144 cf8347b3

res/layout/confirm_lock_password_base.xml

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_marginBottom="24dp"

        android:contentDescription="@string/confirm_fingerprint_icon_content_description"

        android:visibility="gone"/>



</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
 No newline at end of file

res/layout/confirm_lock_pattern_base.xml

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            android:layout_marginBottom="24dp"

            android:contentDescription="@string/confirm_fingerprint_icon_content_description"

            android:visibility="gone"/>

    </LinearLayout>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -777,6 +777,9 @@ 
    <!-- Text shown when "Add fingerprint" button is disabled -->

    <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>









    <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->









    <string name="confirm_fingerprint_icon_content_description">Use your fingerprint to continue.</string>

















    <!-- Title of the preferences category for preference items to control encryption -->









    <string name="crypt_keeper_settings_title">Encryption</string>