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

Commit 918a7d18 authored Nov 28, 2022 by András Kurucz Committed by Automerger Merge Worker Nov 28, 2022

Merge "Allow to block/unblock Conversation Notifications from Settings" into...

Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev am: 80095fa0 am: e06c0d90

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20551986

Change-Id: I9965bff813d7943ed40271c739ea9a2e909759f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 3bdedc2a e06c0d90

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(