Merge "Add setting illustration to notification cooldown" into main

This commit is contained in:
Treehugger Robot
2024-07-27 00:01:09 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 8 deletions

File diff suppressed because one or more lines are too long

View File

@@ -17,20 +17,20 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/notification_polite_title"> android:title="@string/notification_polite_title">
<com.android.settingslib.widget.TopIntroPreference <com.android.settingslib.widget.TopIntroPreference
android:key="polite_notification_desc" android:key="polite_notification_desc"
android:title="@string/notification_polite_description"/> android:title="@string/notification_polite_description"/>
<!-- TODO(b/330606963): add the illustration back when animation is ready--> <com.android.settingslib.widget.IllustrationPreference
<!-- <com.android.settingslib.widget.IllustrationPreference--> android:key="notification_cooldown_illustration"
<!-- android:key="bubbles_illustration"--> settings:searchable="false"
<!-- settings:searchable="false"--> android:selectable="false"
<!-- android:selectable="false"--> app:lottie_rawRes="@raw/lottie_notification_cooldown"
<!-- app:lottie_rawRes="@raw/lottie_bubbles"--> app:lottie_cacheComposition="false"
<!-- app:lottie_cacheComposition="false"--> settings:dynamicColor="true"/>
<!-- settings:dynamicColor="true" />-->
<com.android.settingslib.widget.MainSwitchPreference <com.android.settingslib.widget.MainSwitchPreference
android:key="polite_notification_global_pref" android:key="polite_notification_global_pref"