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

Commit 80095fa0 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev

parents 3bde8a50 0fa99226

res/xml/conversation_notification_settings.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
        android:layout="@layout/settings_entity_header"

        settings:allowDividerBelow="true"/>



    <com.android.settings.widget.SettingsMainSwitchPreference

        android:key="block" />



    <!-- important conversation -->

    <com.android.settings.notification.app.ConversationPriorityPreference

        android:key="priority"

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

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ public class ConversationNotificationSettings extends NotificationSettings { 
    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        mControllers = new ArrayList<>();

        mControllers.add(new ConversationHeaderPreferenceController(context, this));

        mControllers.add(new BlockPreferenceController(context, mDependentFieldListener, mBackend));

        mControllers.add(new ConversationPriorityPreferenceController(

                context, mBackend, mDependentFieldListener));

        mControllers.add(new HighImportancePreferenceController(