From 017ae508a0348becb12df90e9fd04e15389869b4 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 16 Mar 2016 11:40:54 -0400
Subject: [PATCH] String and accessibility changes.

Bug: 27490367
Bug: 27491350
Bug: 27655047
Bug: 24573668
Change-Id: I972d15666b206fd4f94fc55bec77b8cfbc6b7e04
---
 res/values/strings.xml                            |  6 +++---
 .../ConfirmDeviceCredentialBaseFragment.java      | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 95e3ab03d6b..785dcb11bfd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5895,7 +5895,7 @@
     <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
 
     <!--  Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
-    <string name="zen_mode_visual_interruptions_settings_title">Visual interruptions</string>
+    <string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string>
 
 
     <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
@@ -6501,11 +6501,11 @@
     <string name="filter_notif_blocked_apps">Blocked</string>
     <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
     <string name="filter_with_domain_urls_apps">With domain URLs</string>
-    <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+    <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=50] -->
     <string name="filter_notif_priority_apps">Overrides Do Not Disturb</string>
     <!-- Label for showing apps redacting sensitive notifications in list [CHAR LIMIT=50] -->
     <string name="filter_notif_sensitive_apps">No sensitive content on lock screen</string>
-    <!-- Label for showing apps hiding notifications from lockscreen [CHAR LIMIT=30] -->
+    <!-- Label for showing apps hiding notifications from lockscreen [CHAR LIMIT=50] -->
     <string name="filter_notif_hide_notifications_apps">Never shown on lock screen</string>
     <!-- Filter label for apps that the user has silenced [CHAR LIMIT=40] -->
     <string name="filter_notif_silent">Shown silently</string>
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index 592589047c5..b9836d133cd 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -132,17 +132,22 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
         }
     }
 
-    protected void setAccessibilityTitle(CharSequence suplementalText) {
+    protected void setAccessibilityTitle(CharSequence supplementalText) {
         Intent intent = getActivity().getIntent();
         if (intent != null) {
             CharSequence titleText = intent.getCharSequenceExtra(
                     ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
-            if (titleText == null || suplementalText == null) {
+            if (titleText == null && supplementalText == null) {
                 return;
             }
-            String accessibilityTitle =
-                    new StringBuilder(titleText).append(",").append(suplementalText).toString();
-            getActivity().setTitle(Utils.createAccessibleSequence(titleText, accessibilityTitle));
+            StringBuilder builder = new StringBuilder();
+            if (titleText != null) {
+                builder.append(titleText).append(",");
+            }
+            if (supplementalText != null) {
+                builder.append(supplementalText);
+            }
+            getActivity().setTitle(Utils.createAccessibleSequence(titleText, builder.toString()));
         }
     }