commit d63e696902cbefaa7361aaa16e6b20d0fe593cdb
author Jason Monk <jmonk@google.com> Fri Jun 19 15:22:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 19 15:22:21 2015 +0000
tree 6f083ee63a6c585cff42be418d2f43422c3a2fb9
parent 7699cad0042b8bc8cf3cd5ca728f013abe175de8
parent 2e78f53af11366c875938919a8a187700c60d544

Merge "Add content description to owner info status text" into mnc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8e06465..dfde64d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6845,4 +6845,7 @@
 
     <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
     <string name="work_profile_usage_access_warning">Turning off usage access for this app doesn\u2019t prevent your administrator tracking data usage for apps in your work profile.</string>
+
+    <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+    <string name="accessibility_lock_screen_progress"><xliff:g id="count" example="1">%1$d</xliff:g> of <xliff:g id="count" example="1">%2$d</xliff:g> characters used</string>
 </resources>

src/com/android/settings/OwnerInfoSettings.java

diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index 9cc78ea..d2fdbce 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -92,9 +92,13 @@
     }
 
     private void updateOwnerInfoStatus() {
+        int chars = mOwnerInfo.getText().toString().length();
         String status = getString(R.string.owner_info_settings_status,
-                mOwnerInfo.getText().toString().length(), MAX_CHARS);
+                chars, MAX_CHARS);
+        String accessibilityStatus = getString(R.string.accessibility_lock_screen_progress,
+                chars, MAX_CHARS);
         mOwnerInfoStatus.setText(status);
+        mOwnerInfoStatus.setContentDescription(accessibilityStatus);
     }
 
     @Override