Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev

Browse Source 
* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
This commit is contained in:
Jinsong Mu
2014-12-08 19:35:31 +00:00
committed by Android Git Automerger
parent 657f25e964 6fac0351ce
commit 5a181a2436
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Keyguard/res/layout/keyguard_pin_view.xml
View File

@@ -55,6 +55,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginRight="72dp" android:layout_marginRight="72dp"
androidprv:scaledTextSize="28" androidprv:scaledTextSize="28"
android:contentDescription="@string/keyguard_accessibility_pin_area"
/> />
<ImageButton <ImageButton
android:id="@+id/delete_button" android:id="@+id/delete_button"

4
packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
View File

@@ -26,8 +26,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
androidprv:layout_maxWidth="@dimen/keyguard_security_width" androidprv:layout_maxWidth="@dimen/keyguard_security_width"
androidprv:layout_maxHeight="@dimen/keyguard_security_max_height" androidprv:layout_maxHeight="@dimen/keyguard_security_max_height"
android:gravity="center_horizontal" android:gravity="center_horizontal">
android:contentDescription="@string/keyguard_accessibility_pin_unlock">
<ImageView <ImageView
android:id="@+id/keyguard_sim" android:id="@+id/keyguard_sim"
@@ -62,6 +61,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginRight="72dp" android:layout_marginRight="72dp"
androidprv:scaledTextSize="28" androidprv:scaledTextSize="28"
android:contentDescription="@string/keyguard_accessibility_sim_pin_area"
/> />
<ImageButton <ImageButton
android:id="@+id/delete_button" android:id="@+id/delete_button"

1
packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
View File

@@ -62,6 +62,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginRight="72dp" android:layout_marginRight="72dp"
androidprv:scaledTextSize="28" androidprv:scaledTextSize="28"
android:contentDescription="@string/keyguard_accessibility_sim_puk_area"
/> />
<ImageButton <ImageButton
android:id="@+id/delete_button" android:id="@+id/delete_button"

6
packages/Keyguard/res/values/strings.xml
View File

@@ -141,6 +141,12 @@
<string name="keyguard_accessibility_pattern_area">Pattern area.</string> <string name="keyguard_accessibility_pattern_area">Pattern area.</string>
<!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] --> <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_slide_area">Slide area.</string> <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. --> <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
<string name="keyguard_accessibility_transport_prev_description">Previous track button</string> <string name="keyguard_accessibility_transport_prev_description">Previous track button</string>