summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJinsong Mu <jinsong@google.com>2014-12-03 18:13:15 -0800
committerJinsong Mu <jinsong@google.com>2014-12-05 09:36:19 -0800
commitdc6efdc1c6248a4762f98d1108c80368271e8bbb (patch)
treee7af41c4d634f472213ba2d63240a34043017234
parent217814bf2bef703be8b24cd4f1ea454ca6638111 (diff)
downloadframeworks_base-dc6efdc1c6248a4762f98d1108c80368271e8bbb.zip
frameworks_base-dc6efdc1c6248a4762f98d1108c80368271e8bbb.tar.gz
frameworks_base-dc6efdc1c6248a4762f98d1108c80368271e8bbb.tar.bz2
Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock.
b/18568003 Change-Id: I622ca7c49a8aa712490c8f74fcd7a1ab6d2ead5f
-rw-r--r--packages/Keyguard/res/layout/keyguard_pin_view.xml1
-rw-r--r--packages/Keyguard/res/layout/keyguard_sim_pin_view.xml4
-rw-r--r--packages/Keyguard/res/layout/keyguard_sim_puk_view.xml1
-rw-r--r--packages/Keyguard/res/values/strings.xml6
4 files changed, 10 insertions, 2 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_pin_view.xml b/packages/Keyguard/res/layout/keyguard_pin_view.xml
index 4cbddde..2e7464b 100644
--- a/packages/Keyguard/res/layout/keyguard_pin_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_pin_view.xml
@@ -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"
diff --git a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
index c702c8d..929fa09 100644
--- a/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
@@ -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"
diff --git a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
index f6edd83..0cf802d 100644
--- a/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
@@ -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"
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml
index b97b5a3..ebf0b69 100644
--- a/packages/Keyguard/res/values/strings.xml
+++ b/packages/Keyguard/res/values/strings.xml
@@ -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>