Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56d45997 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Remove bubble settings from channel pages" into rvc-dev

parents b3f2c0d5 13851814

res/xml/channel_notification_settings.xml

+0 −6
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/notification/app/ChannelNotificationSettings.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

    }