Merge "Cosmetic changes to zen mode people & sound/vibration screens"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 159bcae..a5a5501 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9752,6 +9752,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 ed21435..1fd2fc0 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 b11dd9c..7410716 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 02d2647..2b66482 100644
--- a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
@@ -60,8 +60,8 @@
"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;
}