diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-29 21:23:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 21:23:25 +0000 |
| commit | e2cd84196e1266200f906b5d721640217fc2e6f9 (patch) | |
| tree | d90d4875bf6d932b7cede261ae770067cb68d2b0 /packages | |
| parent | 93184eef410da6bb958d22e1dc90f3fddabc9369 (diff) | |
| parent | d2def946390505077766e34b6df4a529b25fdc23 (diff) | |
| download | frameworks_base-e2cd84196e1266200f906b5d721640217fc2e6f9.zip frameworks_base-e2cd84196e1266200f906b5d721640217fc2e6f9.tar.gz frameworks_base-e2cd84196e1266200f906b5d721640217fc2e6f9.tar.bz2 | |
Merge "Fix pattern lock for accessibility" into mnc-dev
Diffstat (limited to 'packages')
| -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 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] --> |