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

Commit b3898fbe authored by Jinsong Mu's avatar Jinsong Mu Committed by Android (Google) Code Review
Browse files

Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked... 

Merge "Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev
parents 6a1c8256 dc6efdc1

packages/Keyguard/res/layout/keyguard_pin_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
                    android:layout_centerHorizontal="true"

                    android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="28"

                    android:contentDescription="@string/keyguard_accessibility_pin_area"

                    />

            <ImageButton

                    android:id="@+id/delete_button"

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
        android:layout_height="match_parent"

        androidprv:layout_maxWidth="@dimen/keyguard_security_width"

        androidprv:layout_maxHeight="@dimen/keyguard_security_max_height"

        android:gravity="center_horizontal"

        android:contentDescription="@string/keyguard_accessibility_pin_unlock">

        android:gravity="center_horizontal">



    <ImageView

            android:id="@+id/keyguard_sim"
@@ -62,6 +61,7 @@ 
                    android:layout_centerHorizontal="true"

                    android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="28"

                    android:contentDescription="@string/keyguard_accessibility_sim_pin_area"

                    />

            <ImageButton

                    android:id="@+id/delete_button"

packages/Keyguard/res/layout/keyguard_sim_puk_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
                    android:layout_centerHorizontal="true"

                    android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="28"

                    android:contentDescription="@string/keyguard_accessibility_sim_puk_area"

                    />

            <ImageButton

                    android:id="@+id/delete_button"

packages/Keyguard/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,12 @@ 
    <string name="keyguard_accessibility_pattern_area">Pattern area.</string>

    <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_slide_area">Slide area.</string>

    <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_pin_area">PIN area</string>

    <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_sim_pin_area">SIM PIN area</string>

    <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_sim_puk_area">SIM PUK area</string>



    <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->

    <string name="keyguard_accessibility_transport_prev_description">Previous track button</string>