Clean up notification settings

- Reorganize settings
- Fix dividers
- Add icons
- Fix titles
- Fix colors
- Fix indentation
- Add summaries

Fixes: 190079590
Test: manual inspection, robotests

Change-Id: Ia03219575d3b0c78f9f9b088aa3cdaa29cfdf412
This commit is contained in:
Julia Reynolds
2021-06-17 16:31:35 -04:00
parent 0fcac8bf0d
commit 6a603e7f4b
21 changed files with 231 additions and 135 deletions

View File

@@ -32,41 +32,23 @@
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"/>
<PreferenceCategory
android:key="bubbles"
android:title="@string/notification_bubbles_title">
<!-- 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" />
<Preference
android:key="notification_bubbles"
android:title="@string/bubbles_conversation_app_link"
/>
</PreferenceCategory>
<!-- 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"/>
<!-- 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 -->
@@ -81,27 +63,34 @@
<!-- Visibility Override -->
<com.android.settings.RestrictedListPreference
android:key="visibility_override"
android:icon="@drawable/ic_lock_closed"
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"
settings:useAdditionalSummary="true"
android:icon="@drawable/ic_notification_dot"
settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
<!-- Lights -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="lights"
android:title="@string/notification_show_lights_title"
settings:useAdditionalSummary="true"/>
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"
settings:useAdditionalSummary="true" />
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>