Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev am: 80095fa001
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20551986 Change-Id: I1437a24ea8da6e36be62a2dab42307a24dc5e167 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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"
|
||||
|
@@ -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(
|
||||
|
Reference in New Issue
Block a user