a331c50b53
-Reorder fields so the appear/disappear more cleanly -Remove some divider lines- they don't animate with the content, for some reason -Remove an unused field -Hide the badge field (remaining field with divider) if there are no channels -Change style of 'Notifications are blocked' field to better match the other fields Test: revoke notification permission for apps with and without channels Test: BadgePreferenceControllerTest Fixes: 233962859 Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
97 lines
3.5 KiB
XML
97 lines
3.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2017 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="app_notifications"
|
|
android:title="@string/notifications_title">
|
|
|
|
<com.android.settingslib.widget.LayoutPreference
|
|
android:key="pref_app_header"
|
|
android:layout="@layout/settings_entity_header" />
|
|
|
|
<com.android.settings.widget.SettingsMainSwitchPreference
|
|
android:key="block" />
|
|
|
|
<Preference
|
|
android:key="block_desc" />
|
|
|
|
<!-- Conversations added here -->
|
|
<PreferenceCategory
|
|
android:title="@string/conversations_category_title"
|
|
android:key="conversations"
|
|
android:visibility="gone">
|
|
|
|
</PreferenceCategory>
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="invalid_conversation_switch"
|
|
android:title="@string/conversation_section_switch_title" />
|
|
<Preference
|
|
android:key="invalid_conversation_info"/>
|
|
|
|
<!--Bubbles -->
|
|
<Preference
|
|
android:key="bubble_pref_link"
|
|
android:title="@string/notification_bubbles_title"
|
|
android:icon="@drawable/ic_create_bubble"
|
|
settings:controller="com.android.settings.notification.app.BubbleSummaryPreferenceController">
|
|
</Preference>
|
|
|
|
<!-- Channels/Channel groups added here -->
|
|
<PreferenceCategory
|
|
android:key="channels"
|
|
android:layout="@layout/empty_view" />
|
|
|
|
<!-- Importance toggle -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="allow_sound"
|
|
android:title="@string/allow_interruption"
|
|
android:summary="@string/allow_interruption_summary" />
|
|
|
|
<!-- Visibility Override -->
|
|
<com.android.settings.RestrictedListPreference
|
|
android:key="visibility_override"
|
|
android:title="@string/app_notification_visibility_override_title"/>
|
|
|
|
<!-- Bypass DND -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="bypass_dnd"
|
|
android:title="@string/app_notification_override_dnd_title"
|
|
android:summary="@string/app_notification_override_dnd_summary"/>
|
|
|
|
<!-- Show badge -->
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="badge"
|
|
android:title="@string/notification_badge_title"
|
|
settings:useAdditionalSummary="true"
|
|
android:order="1001"
|
|
android:icon="@drawable/ic_notification_dot"
|
|
settings:allowDividerAbove="true"
|
|
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
|
|
|
|
<Preference
|
|
android:key="app_link"
|
|
android:order="1003"
|
|
android:icon="@drawable/ic_settings_24dp"
|
|
android:title="@string/app_settings_link" />
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="deleted"
|
|
android:icon="@drawable/ic_trash_can"
|
|
android:order="8000" />
|
|
|
|
</PreferenceScreen>
|