From 138518141b955a181eb3f881fab6a31d20d57baa Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 30 Mar 2020 13:20:10 -0400
Subject: [PATCH] Remove bubble settings from channel pages

It's only relevant for conversations

Test: manual
Fixes: 152764095
Change-Id: I31b342396ac3e66652ffc1457321594c55bbe0f3
---
 res/xml/channel_notification_settings.xml                   | 6 ------
 .../notification/app/ChannelNotificationSettings.java       | 2 --
 2 files changed, 8 deletions(-)

diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index 1117921f9de..ff1427b7d7b 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -108,12 +108,6 @@
             settings:useAdditionalSummary="true"
             settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
 
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="bubble_pref"
-            android:title="@string/notification_bubbles_title"
-            android:order="16"
-            settings:restrictedSwitchSummary="@string/enabled_by_admin" />
-
         <!-- Bypass DND -->
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="bypass_dnd"
diff --git a/src/com/android/settings/notification/app/ChannelNotificationSettings.java b/src/com/android/settings/notification/app/ChannelNotificationSettings.java
index 9d80304ba29..319c7988f14 100644
--- a/src/com/android/settings/notification/app/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/app/ChannelNotificationSettings.java
@@ -129,8 +129,6 @@ public class ChannelNotificationSettings extends NotificationSettings {
         mControllers.add(new BadgePreferenceController(context, mBackend));
         mControllers.add(new DndPreferenceController(context, mBackend));
         mControllers.add(new NotificationsOffPreferenceController(context));
-        mControllers.add(new BubblePreferenceController(context, getChildFragmentManager(),
-                mBackend, false /* isAppPage */));
         mControllers.add(new ConversationPromotePreferenceController(context, this, mBackend));
         return new ArrayList<>(mControllers);
     }