diff options
author | Adrian Roos <roosa@google.com> | 2015-02-20 14:53:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-20 14:53:48 +0000 |
commit | 1156da8c0dce2b2e12243f56f7d7bb6f62f7d07b (patch) | |
tree | 237a9a919bfa8e7cf59ae784af5246aab34aefdb /packages/Keyguard | |
parent | 806a6f07a37c16b37631d8707dd1f2b41276fafc (diff) | |
parent | 309b71e53086c9bd3b7610799836d66d64aed654 (diff) | |
download | frameworks_base-1156da8c0dce2b2e12243f56f7d7bb6f62f7d07b.zip frameworks_base-1156da8c0dce2b2e12243f56f7d7bb6f62f7d07b.tar.gz frameworks_base-1156da8c0dce2b2e12243f56f7d7bb6f62f7d07b.tar.bz2 |
am 309b71e5: am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit '309b71e53086c9bd3b7610799836d66d64aed654':
Fix change IME content description
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/res/layout/keyguard_password_view.xml | 1 | ||||
-rw-r--r-- | packages/Keyguard/res/values/strings.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_password_view.xml b/packages/Keyguard/res/layout/keyguard_password_view.xml index cff2fc7..7dcaf6d 100644 --- a/packages/Keyguard/res/layout/keyguard_password_view.xml +++ b/packages/Keyguard/res/layout/keyguard_password_view.xml @@ -64,6 +64,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:src="@drawable/ic_lockscreen_ime" + android:contentDescription="@string/accessibility_ime_switch_button" android:clickable="true" android:padding="8dip" android:layout_gravity="end|center_vertical" diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 8b18b2e..5047330 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -297,4 +297,7 @@ This is displayed if the phone is not connected to a carrier.--> <string name="keyguard_carrier_default">No service.</string> + <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Switch input method button.</string> + </resources> |