From 5164149efc0b20fe6e3a35809dea4387636d429b Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 16 Mar 2023 17:29:55 -0400
Subject: [PATCH] Add missing conversation field

NotificationChannel#EDIT_CONVERSATION should show
both 'demote conversation' and 'promote conversation'
fields.

Test: View Partial and Full Settings for promoted and
demoted channels
Fixes: 273508155

Change-Id: I4a17a73d695d7c79837fc647b79968f535fa4393
---
 res/xml/conversation_notification_settings.xml             | 7 +++++++
 .../notification/app/ConversationNotificationSettings.java | 1 +
 2 files changed, 8 insertions(+)

diff --git a/res/xml/conversation_notification_settings.xml b/res/xml/conversation_notification_settings.xml
index 9078e2d0905..89812a774ae 100644
--- a/res/xml/conversation_notification_settings.xml
+++ b/res/xml/conversation_notification_settings.xml
@@ -96,4 +96,11 @@
         android:summary="@string/demote_conversation_summary"
         settings:allowDividerAbove="true"/>
 
+    <!-- only used in ChannelPanelActivity -->
+    <Preference
+        android:key="convo_promote"
+        android:icon="@drawable/ic_promote_conversation"
+        android:title="@string/promote_conversation_title"
+        android:summary="@string/promote_conversation_summary" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/app/ConversationNotificationSettings.java b/src/com/android/settings/notification/app/ConversationNotificationSettings.java
index b452309f84c..02ea6c060ec 100644
--- a/src/com/android/settings/notification/app/ConversationNotificationSettings.java
+++ b/src/com/android/settings/notification/app/ConversationNotificationSettings.java
@@ -99,6 +99,7 @@ public class ConversationNotificationSettings extends NotificationSettings {
         mControllers.add(new BubblePreferenceController(context, getChildFragmentManager(),
                 mBackend, false /* isAppPage */, null /* dependentFieldListener */));
         mControllers.add(new ConversationDemotePreferenceController(context, this, mBackend));
+        mControllers.add(new ConversationPromotePreferenceController(context, this, mBackend));
         mControllers.add(new BubbleCategoryPreferenceController(context));
         mControllers.add(new BubbleLinkPreferenceController(context));
         return new ArrayList<>(mControllers);