From e646b28e268755bdfb0850b7c74356a466430f4c Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 2 Apr 2020 12:06:49 -0400
Subject: [PATCH] Add conversations image to People DND setting page

Previously the image was only on the Conversations settings page, but it
should also be included on the People settings page too.

Test: manual
Bug: 151845457
Change-Id: I99af85b3dcc266a1a5743755fe3cb31fc16ccfba
---
 res/xml/zen_mode_people_settings.xml                 |  6 ++++++
 .../notification/zen/ZenModePeopleSettings.java      | 12 +++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/res/xml/zen_mode_people_settings.xml b/res/xml/zen_mode_people_settings.xml
index 140c2414aa4..1db438871be 100644
--- a/res/xml/zen_mode_people_settings.xml
+++ b/res/xml/zen_mode_people_settings.xml
@@ -25,6 +25,12 @@
        android:key="zen_mode_settings_category_conversations"
        android:title="@string/zen_mode_conversations_section_title">
 
+      <!-- Senders image -->
+      <com.android.settingslib.widget.LayoutPreference
+          android:key="zen_mode_conversations_image"
+          android:layout="@layout/zen_mode_senders_overlay_image"
+          android:selectable="false"/>
+
       <Preference
           android:key="zen_mode_conversations"
           android:title="@string/zen_mode_conversations_title"
diff --git a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
index 4971e544b26..962badbd05e 100644
--- a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java
@@ -25,6 +25,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -47,12 +48,16 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
             app = null;
         }
         return buildPreferenceControllers(
-                context, getSettingsLifecycle(), app, this, getFragmentManager());
+                context, getSettingsLifecycle(), app, this, getFragmentManager(),
+                new NotificationBackend());
     }
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Lifecycle lifecycle, Application app, Fragment host, FragmentManager fragmentManager) {
+            Lifecycle lifecycle, Application app, Fragment host, FragmentManager fragmentManager,
+            NotificationBackend notificationBackend) {
         List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new ZenModeConversationsImagePreferenceController(context,
+                "zen_mode_conversations_image", lifecycle, notificationBackend));
         controllers.add(new ZenModeConversationsPreferenceController(context,
                 "zen_mode_conversations", lifecycle));
         controllers.add(new ZenModeCallsPreferenceController(context, lifecycle,
@@ -83,7 +88,8 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
                         Context context) {
-                    return buildPreferenceControllers(context, null, null, null, null);
+                    return buildPreferenceControllers(context, null, null, null,
+                            null, null);
                 }
             };
 }