From 679445fb435724ad84ce3ff26783058f15e41baa Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 2 Jun 2021 16:16:17 -0400
Subject: [PATCH 1/2] Updates to conversation page

- Make info preference not selectable
- remove dividers

Test: manual
Fixes: 189414449
Change-Id: I081cea0d51fbc2d1c54ac392cee88a5750985fce
---
 res/xml/conversation_list_settings.xml        | 20 ++++---------------
 ...rityConversationsPreferenceController.java |  1 +
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/res/xml/conversation_list_settings.xml b/res/xml/conversation_list_settings.xml
index f61d2016868..129533fd802 100644
--- a/res/xml/conversation_list_settings.xml
+++ b/res/xml/conversation_list_settings.xml
@@ -29,18 +29,10 @@
     <PreferenceCategory
         android:key="important_conversations"
         android:title="@string/important_conversations"
-        settings:isPreferenceVisible="false"
-        settings:allowDividerAbove="false"
-        settings:allowDividerBelow="true" >
-        <Preference
-            android:key="behavior"
-            android:selectable="false"
-            android:summary="@string/important_conversation_behavior_summary"/>
+        settings:isPreferenceVisible="false" >
         <!-- Important conversations added here -->
         <PreferenceCategory
-            android:key="important_conversations_list"
-            settings:allowDividerAbove="false"
-            settings:allowDividerBelow="false" >
+            android:key="important_conversations_list" >
         </PreferenceCategory>
     </PreferenceCategory>
 
@@ -48,16 +40,12 @@
     <PreferenceCategory
         android:title="@string/other_conversations"
         android:key="other_conversations"
-        settings:isPreferenceVisible="false"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="false" />
+        settings:isPreferenceVisible="false" />
 
     <!-- Recent conversations added here -->
     <PreferenceCategory
         android:title="@string/recent_conversations"
         android:key="recent_conversations"
-        settings:isPreferenceVisible="false"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="false" />
+        settings:isPreferenceVisible="false"/>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java b/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
index 3888a0ac7ed..3fb605bd2fe 100644
--- a/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/PriorityConversationsPreferenceController.java
@@ -55,6 +55,7 @@ public class PriorityConversationsPreferenceController extends
         Preference pref = new Preference(mContext);
         pref.setOrder(1);
         pref.setSummary(R.string.important_conversations_summary_bubbles);
+        pref.setSelectable(false);
         return pref;
     }
 

From c94f997a2fdefb78cba479d3f7cc819027946df5 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 3 Jun 2021 10:52:18 -0400
Subject: [PATCH 2/2] Fix broken test

Test: robotests
Fixes: 189352955
Change-Id: I31066a6fdd72e923369e613b656ffe767b3e3b5c
---
 .../app/ConversationListPreferenceController.java             | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index 0c4f2274340..2500a22c188 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -69,9 +69,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
             populateConversations(conversations, containerGroup);
         }
 
-        if (containerGroup.getPreferenceCount() == 0) {
-            containerGroup.setVisible(false);
-        } else {
+        if (containerGroup.getPreferenceCount() != 0) {
             Preference summaryPref = getSummaryPreference();
             if (summaryPref != null) {
                 containerGroup.addPreference(summaryPref);