summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/res
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-02-20 14:28:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-20 14:28:38 +0000
commit26b0d973d8c2b05e6141fb4808fbb0a28cb7f713 (patch)
tree64745ae4b7114f2e67b84e2364458c71bf1d210f /packages/Keyguard/res
parentbb1c03e9500e2a13044925c78a11d3c48a3a47ef (diff)
parent4a002631910b2d812b2e2ae04f6b69782bc2c383 (diff)
downloadframeworks_base-26b0d973d8c2b05e6141fb4808fbb0a28cb7f713.zip
frameworks_base-26b0d973d8c2b05e6141fb4808fbb0a28cb7f713.tar.gz
frameworks_base-26b0d973d8c2b05e6141fb4808fbb0a28cb7f713.tar.bz2
Merge "Fix change IME content description" into lmp-mr1-dev
Diffstat (limited to 'packages/Keyguard/res')
-rw-r--r--packages/Keyguard/res/layout/keyguard_password_view.xml1
-rw-r--r--packages/Keyguard/res/values/strings.xml3
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 b7d5d30..b1b2631 100644
--- a/packages/Keyguard/res/layout/keyguard_password_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_password_view.xml
@@ -65,6 +65,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 feab127..5990647 100644
--- a/packages/Keyguard/res/values/strings.xml
+++ b/packages/Keyguard/res/values/strings.xml
@@ -433,4 +433,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>