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

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

Merge "Add missing conversation field" into udc-dev

parents 8170de07 5164149e

res/xml/conversation_notification_settings.xml

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

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

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