From 0a7554acfa5b0bc376b80c8683d1c29d9b90a352 Mon Sep 17 00:00:00 2001
From: Yuri Lin <yurilin@google.com>
Date: Wed, 26 Jan 2022 13:01:26 -0500
Subject: [PATCH] Cosmetic changes to zen mode people & sound/vibration screens

On the people screen, have the footer show up all the time and provide a more relevant message (indicating that the chosen people override any app/etc settings) than the current setting.

On the sound/vibration screen, remove the sub-title since it's a bit confusing what exactly is being turned on or off.

Bug: 190180868
Bug: 215564123
Test: manual
Change-Id: I78d407af350a9f99d26d1e5082b752881bd3f186
---
 res/values/strings.xml                                        | 3 +++
 res/xml/zen_mode_people_settings.xml                          | 1 -
 res/xml/zen_mode_sound_vibration_settings.xml                 | 1 -
 .../settings/notification/zen/ZenModePeopleSettings.java      | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f7c218b020..2458112c2a7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9741,6 +9741,9 @@
     setting page -->
     <string name="zen_mode_people_calls_messages_section_title" translatable="false">Who can reach you</string>
 
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: people screen footer -->
+    <string name="zen_mode_people_footer" translatable="false">Even if messaging or calling apps can\u0027t notify you, people you choose here can still reach you through those apps</string>
+
     <!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title -->
     <string name="zen_mode_calls_title">Calls</string>
     <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
diff --git a/res/xml/zen_mode_people_settings.xml b/res/xml/zen_mode_people_settings.xml
index ed21435018a..1fd2fc000fd 100644
--- a/res/xml/zen_mode_people_settings.xml
+++ b/res/xml/zen_mode_people_settings.xml
@@ -37,7 +37,6 @@
 
    </PreferenceCategory>
 
-   <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
    <com.android.settingslib.widget.FooterPreference/>
 
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index b11dd9c5ae1..74107168623 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -20,7 +20,6 @@
     android:title="@string/zen_category_exceptions" >
 
     <PreferenceCategory
-        android:title="@string/zen_mode_settings_category"
         android:key="zen_mode_settings_category_sound_vibration">
 
         <!-- Alarms -->
diff --git a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
index 02d2647e2ef..2b66482584b 100644
--- a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
@@ -60,8 +60,8 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
                 "zen_mode_people_calls"));
         controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,
                 "zen_mode_people_messages"));
-        controllers.add(new ZenModeSettingsFooterPreferenceController(context, lifecycle,
-                fragmentManager));
+        controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,
+                R.string.zen_mode_people_footer));
         return controllers;
     }