From 052ac3d84e773563569ccaf359d65e6918c92889 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 16 Oct 2017 16:38:19 -0400
Subject: [PATCH] Adjusted char limits and media/system string.

Change-Id: Iad4d9980fc52970d1ee8221053dd116c5bbcd9cb
Fixes: 67821000
Fixes: 67827886
Fixes: 67820998
Test: manual
---
 res/values/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8ad5de86640..819c4916319 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6694,20 +6694,20 @@
     <!-- Do not disturb: Title for the behaviors option and associated settings page. [CHAR LIMIT=30] -->
     <string name="zen_mode_behavior_settings_title">Behavior</string>
 
-    <!-- Do not disturb: Instructions indicating what types of sounds can bypass DND. [CHAR LIMIT=30] -->
+    <!-- Do not disturb: Instructions indicating what types of sounds can bypass DND. [CHAR LIMIT=52] -->
     <string name="zen_mode_behavior_allow_title">Allow sounds and vibrations from</string>
 
     <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND. [CHAR LIMIT=30] -->
     <string name="zen_mode_behavior_no_sound">No sound</string>
 
-    <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND due to user and/or API-invoked Total Silence mode. [CHAR LIMIT=30] -->
+    <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND due to user and/or API-invoked Total Silence mode. [CHAR LIMIT=40] -->
     <string name="zen_mode_behavior_total_silence">No sound (Total Silence)</string>
 
     <!-- Do not disturb: Used before specifying which sounds can bypass DND (ie: No sound except alarms and reminders). [CHAR LIMIT=30] -->
-    <string name="zen_mode_behavior_no_sound_except">No sound except <xliff:g id="categories" example="alarms, media and system">%1$s</xliff:g></string>
+    <string name="zen_mode_behavior_no_sound_except">No sound except <xliff:g id="categories" example="alarms, media and system feedback">%1$s</xliff:g></string>
 
-    <!-- Do not disturb: Specifies sounds that can bypass DND in user and/or API-invoked Alarms Only mode.  [CHAR LIMIT=30] -->
-    <string name="zen_mode_behavior_alarms_only">No sound except alarms, media and system (Alarms only)</string>
+    <!-- Do not disturb: Specifies sounds that can bypass DND in user and/or API-invoked Alarms Only mode.  [CHAR LIMIT=100] -->
+    <string name="zen_mode_behavior_alarms_only">No sound except alarms, media and system feedback (Alarms only)</string>
 
     <!--  Do not disturb: Title for the zen mode automation listing. [CHAR LIMIT=30] -->
     <string name="zen_mode_automation_settings_title">Automatic rules</string>
@@ -7243,7 +7243,7 @@
     <string name="zen_mode_alarms">Alarms</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: Media and system sounds option -->
-    <string name="zen_mode_media_system_other">Media and system sounds</string>
+    <string name="zen_mode_media_system_other">Media and system feedback</string>
 
     <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
     <string name="zen_mode_reminders">Reminders</string>