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

Commit e8030673 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9342863 from 80095fa0 to tm-qpr2-release 

Change-Id: I0f2f80bb3b9250e92679f3a5e438ddf61d51706c
parents e8cb2185 80095fa0

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(