summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-02-19 17:39:40 +0100
committerThe Android Automerger <android-build@google.com>2015-03-03 20:04:15 -0800
commitceb1699ba3303191025aa7e2fae0e983174283d3 (patch)
tree2a37112a7cc1c62bff4798dbbd0251f643bb7755
parente34c3bca2fb8d2012235ae5e77c82756ec829d3e (diff)
downloadbase-ceb1699ba3303191025aa7e2fae0e983174283d3.tar.gz
Fix change IME content description
Bug: 19434845 Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
-rw-r--r--packages/Keyguard/res/layout/keyguard_password_view.xml1
-rw-r--r--packages/Keyguard/res/values/strings.xml3
-rw-r--r--packages/SystemUI/res/values/strings.xml2
3 files changed, 4 insertions, 2 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_password_view.xml b/packages/Keyguard/res/layout/keyguard_password_view.xml
index b7d5d305b61a..b1b2631aef69 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 feab127981fa..59906476b1a3 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>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 38c6a44037f1..558d90aef4b8 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -217,8 +217,6 @@
<!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
<string name="camera_label">open camera</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">Switch input method button.</string>
<!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_compatibility_zoom_button">Compatibility zoom button.</string>