Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
80095fa001
@@ -25,6 +25,9 @@
|
|||||||
android:layout="@layout/settings_entity_header"
|
android:layout="@layout/settings_entity_header"
|
||||||
settings:allowDividerBelow="true"/>
|
settings:allowDividerBelow="true"/>
|
||||||
|
|
||||||
|
<com.android.settings.widget.SettingsMainSwitchPreference
|
||||||
|
android:key="block" />
|
||||||
|
|
||||||
<!-- important conversation -->
|
<!-- important conversation -->
|
||||||
<com.android.settings.notification.app.ConversationPriorityPreference
|
<com.android.settings.notification.app.ConversationPriorityPreference
|
||||||
android:key="priority"
|
android:key="priority"
|
||||||
|
@@ -83,6 +83,7 @@ public class ConversationNotificationSettings extends NotificationSettings {
|
|||||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||||
mControllers = new ArrayList<>();
|
mControllers = new ArrayList<>();
|
||||||
mControllers.add(new ConversationHeaderPreferenceController(context, this));
|
mControllers.add(new ConversationHeaderPreferenceController(context, this));
|
||||||
|
mControllers.add(new BlockPreferenceController(context, mDependentFieldListener, mBackend));
|
||||||
mControllers.add(new ConversationPriorityPreferenceController(
|
mControllers.add(new ConversationPriorityPreferenceController(
|
||||||
context, mBackend, mDependentFieldListener));
|
context, mBackend, mDependentFieldListener));
|
||||||
mControllers.add(new HighImportancePreferenceController(
|
mControllers.add(new HighImportancePreferenceController(
|
||||||
|
Reference in New Issue
Block a user