0fa99226e1
The user can end up in a state where the Channel of a Conversation is blocked (has an importance of 0). Currently there was no way to unblock it, because we didn't allow it from the Settings. Therefore now the option to block/unblock is added to the Conversation Settings page. Fixes: 255062535 Test: Block/Unblock a Conversation from Settings Test: Mark a notification blocked and conversation by clicking the “Show notifications” toggle and the “This is a conversation” button at once. Now unblock it from the Settings. Change-Id: I06778d259155d87d6af4bdb7013cd3b6c9a2e5ee
100 lines
4.0 KiB
XML
100 lines
4.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2020 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:key="conversation_settings"
|
|
android:title="" >
|
|
|
|
<com.android.settingslib.widget.LayoutPreference
|
|
android:key="pref_app_header"
|
|
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"
|
|
android:title="@string/notification_conversation_important"
|
|
settings:allowDividerAbove="true"
|
|
settings:allowDividerBelow="true"/>
|
|
|
|
<!-- bubbles -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="bubble_pref"
|
|
android:title="@string/bubbles_conversation_toggle_title"
|
|
android:summary="@string/bubbles_conversation_toggle_summary"
|
|
android:icon="@drawable/ic_create_bubble"
|
|
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="block_desc"
|
|
settings:allowDividerAbove="false"/>
|
|
|
|
<!-- peeking -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="high_importance"
|
|
android:title="@string/notification_importance_high_title"
|
|
android:icon="@drawable/ic_notification_peek"
|
|
android:summary="@string/notification_channel_summary_high"/>
|
|
|
|
<!-- ringtone -->
|
|
<com.android.settings.notification.app.NotificationSoundPreference
|
|
android:key="ringtone"
|
|
android:title="@string/notification_channel_sound_title"
|
|
android:dialogTitle="@string/notification_channel_sound_title"
|
|
android:icon="@drawable/ic_notifications"
|
|
android:showSilent="true"
|
|
android:showDefault="true"/>
|
|
|
|
<!-- Visibility Override -->
|
|
<com.android.settings.RestrictedListPreference
|
|
android:key="visibility_override"
|
|
android:icon="@drawable/ic_notification_vis_override"
|
|
android:title="@string/app_notification_visibility_override_title"/>
|
|
|
|
<!-- Show badge -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="badge"
|
|
android:title="@string/notification_channel_badge_title"
|
|
android:icon="@drawable/ic_notification_dot"
|
|
settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
|
|
|
|
<!-- Lights -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="lights"
|
|
android:icon="@drawable/ic_lightbulb_outline_24"
|
|
android:title="@string/notification_show_lights_title"/>
|
|
|
|
<!-- Vibration -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="vibrate"
|
|
android:icon="@drawable/ic_volume_ringer_vibrate"
|
|
android:title="@string/notification_vibrate_title" />
|
|
|
|
<!-- demote -->
|
|
<Preference
|
|
android:key="demote"
|
|
android:icon="@drawable/ic_demote_conversation"
|
|
android:title="@string/demote_conversation_title"
|
|
android:summary="@string/demote_conversation_summary"
|
|
settings:allowDividerAbove="true"/>
|
|
|
|
</PreferenceScreen>
|