diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-29 21:52:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 21:52:08 +0000 |
| commit | f03ad4438323b866fc465e3f2a425c266cdacdf3 (patch) | |
| tree | f920039bf4c2cc76ab618e463d0c458cc4511c9d /packages/Keyguard | |
| parent | 176c878d8af4d6f610e77bd32d788c7d68cfbf3f (diff) | |
| parent | f65209d8082ca1251996021ddf0b227f0c08f56f (diff) | |
| download | frameworks_base-f03ad4438323b866fc465e3f2a425c266cdacdf3.zip frameworks_base-f03ad4438323b866fc465e3f2a425c266cdacdf3.tar.gz frameworks_base-f03ad4438323b866fc465e3f2a425c266cdacdf3.tar.bz2 | |
am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev
* commit 'f65209d8082ca1251996021ddf0b227f0c08f56f':
Fix pattern lock for accessibility
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_pattern_view.xml | 3 | ||||
| -rw-r--r-- | packages/Keyguard/res/values/strings.xml | 2 |
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 14c8a2c..41b1059 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -109,7 +109,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] --> |