From 9bb55e1084dfe73d5a56745336a66f0424e6f2a5 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 4 May 2020 10:25:57 -0400
Subject: [PATCH] Update some notification strings

Test: manual
Fixes: 155516603
Fixes: 155516894
Change-Id: I86058ebdb473890239236d30414cb05787832311
---
 res/values/strings.xml                                       | 5 ++++-
 .../settings/notification/app/BlockPreferenceController.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fed58479451..cdc5cdfa139 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8470,7 +8470,7 @@
     <string name="notification_priority_title">Priority</string>
 
     <!-- [CHAR LIMIT=150] Notification Importance title: important conversation level summary -->
-    <string name="notification_channel_summary_priority">Shows at top of conversation section and appears as a bubble.</string>
+    <string name="notification_channel_summary_priority">Shows at top of conversation section and appears as a bubble</string>
 
     <string name="convo_not_supported_summary"><xliff:g id="app_name" example="Android Services">%1$s</xliff:g> does not support conversation-specific settings.</string>
 
@@ -8491,6 +8491,9 @@
     <!-- [CHAR LIMIT=100] Label for on/off toggle -->
     <string name="notification_switch_label">All \"<xliff:g id="app_name" example="Android Services">%1$s</xliff:g>\" notifications</string>
 
+    <!-- [CHAR LIMIT=100] Label for on/off toggle -->
+    <string name="notification_app_switch_label">All <xliff:g id="app_name" example="Android Services">%1$s</xliff:g> notifications</string>
+
     <!-- Default Apps > Default notification assistant -->
     <string name="default_notification_assistant">Adaptive Notifications</string>
 
diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java
index 37563c0905a..f55ea8c609b 100644
--- a/src/com/android/settings/notification/app/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/app/BlockPreferenceController.java
@@ -137,7 +137,7 @@ public class BlockPreferenceController extends NotificationPreferenceController
             } else {
                 fieldContextName = mAppRow.label;
             }
-            return mContext.getString(R.string.notification_switch_label, fieldContextName);
+            return mContext.getString(R.string.notification_app_switch_label, fieldContextName);
         }
     }
 }