summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-07-27 13:49:53 -0700
committerAdrian Roos <roosa@google.com>2015-07-29 14:13:53 -0700
commitd2def946390505077766e34b6df4a529b25fdc23 (patch)
treeed77c0f0dc9257477c7a72100acc221b2696e4f2 /packages
parent661794307a792690d7608dc81b4e1299937a8f67 (diff)
downloadframeworks_base-d2def946390505077766e34b6df4a529b25fdc23.zip
frameworks_base-d2def946390505077766e34b6df4a529b25fdc23.tar.gz
frameworks_base-d2def946390505077766e34b6df4a529b25fdc23.tar.bz2
Fix pattern lock for accessibility
- remove the content description in Keyguard - only show virtual views when pattern is in progress - add a content description when the pattern is not in progress Bug: 22646748 Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/res/layout/keyguard_pattern_view.xml3
-rw-r--r--packages/Keyguard/res/values/strings.xml2
2 files changed, 1 insertions, 4 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_pattern_view.xml b/packages/Keyguard/res/layout/keyguard_pattern_view.xml
index 09c01de..ccb9af9 100644
--- a/packages/Keyguard/res/layout/keyguard_pattern_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_pattern_view.xml
@@ -63,9 +63,6 @@
android:layout_marginStart="8dip"
android:layout_gravity="center_horizontal"
android:gravity="center"
- android:contentDescription="@string/keyguard_accessibility_pattern_area"
- android:focusable="true"
- android:focusableInTouchMode="true"
android:clipChildren="false"
android:clipToPadding="false" />
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml
index 748129c..cba122f 100644
--- a/packages/Keyguard/res/values/strings.xml
+++ b/packages/Keyguard/res/values/strings.xml
@@ -101,7 +101,7 @@
<!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_password_unlock">Password unlock.</string>
<!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
- <string name="keyguard_accessibility_pattern_area">Pattern area.</string>
+ <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">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] -->