Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I081a35c8,I8a84f688,I60b64a0c into main

Browse Source 
* changes:
  Clean un-used code for notification cool down
  Add tests for updating Settings Page for Avalanche Suppression
  Update Settings Page for Avalanche Suppression
This commit is contained in:
Yining Liu
2024-05-28 15:55:14 +00:00
committed by Android (Google) Code Review
parent 0dca9f78c5 3d0640985b
commit 3e46f1f1c9
9 changed files with 213 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/xml/polite_notifications_settings.xml
View File

@@ -19,20 +19,23 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/notification_polite_title">
<com.android.settings.RestrictedListPreference
android:key="polite_notifications_pref_dlg"
android:persistent="false"
android:title="@string/notification_polite_title"
android:entries="@array/notification_polite_options"
android:entryValues="@array/notification_polite_options_values"
settings:controller="com.android.settings.notification.PoliteNotificationFilterController"/>
<com.android.settingslib.widget.TopIntroPreference
android:key="polite_notification_desc"
android:title="@string/notification_polite_description"/>
<SwitchPreferenceCompat
android:key="notification_polite_vibrate_unlocked"
android:persistent="false"
android:title="@string/notification_polite_vibrate_unlocked"
android:summary="@string/notification_polite_vibrate_unlocked_summary"
settings:controller="com.android.settings.notification.PoliteNotifVibrateUnlockedToggleController" />
<!-- TODO(b/330606963): add the illustration back when animation is ready-->
<!-- <com.android.settingslib.widget.IllustrationPreference-->
<!-- android:key="bubbles_illustration"-->
<!-- settings:searchable="false"-->
<!-- android:selectable="false"-->
<!-- app:lottie_rawRes="@raw/lottie_bubbles"-->
<!-- app:lottie_cacheComposition="false"-->
<!-- settings:dynamicColor="true" />-->
<com.android.settingslib.widget.MainSwitchPreference
android:key="polite_notification_global_pref"
android:title="@string/notification_polite_main_control_title"
settings:controller="com.android.settings.notification.PoliteNotificationGlobalPreferenceController" />
<SwitchPreferenceCompat
android:key="notification_polite_work_profile"