Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: fdf32b618c am: 2db927cb79

Change-Id: I70729282db462779734fc7e29ae6a43d2e8eef70
This commit is contained in:
Julia Reynolds
2020-03-31 05:00:45 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 8 deletions

View File

@@ -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);
}