summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2025-03-24 12:13:24 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-24 12:13:24 -0700
commit0773c4d93fb56aa851825cb12d516b4ac36b30a3 (patch)
treef4dad7eb5b2ef53cfcabdd82800fd9fb8c05b5a4 /res
parent06be21bc9c4540cb03e6deb04ce19226860070dc (diff)
parent53f94f049574621ba10121165ef099b1c1c50279 (diff)
Merge "Merge bundle global & type preference controllers." into main
Diffstat (limited to 'res')
-rw-r--r--res/xml/bundle_notifications_settings.xml39
1 files changed, 19 insertions, 20 deletions
diff --git a/res/xml/bundle_notifications_settings.xml b/res/xml/bundle_notifications_settings.xml
index 3ff8c053273..0f153de81a6 100644
--- a/res/xml/bundle_notifications_settings.xml
+++ b/res/xml/bundle_notifications_settings.xml
@@ -32,30 +32,29 @@
settings:searchable="false"
android:title="@string/notification_bundle_description"/>
- <com.android.settingslib.widget.MainSwitchPreference
- android:key="global_pref"
- android:title="@string/notification_bundle_main_control_title"
- settings:controller="com.android.settings.notification.BundleGlobalPreferenceController" />
+ <PreferenceCategory
+ android:key="enabled_settings">
+
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="global_pref"
+ android:title="@string/notification_bundle_main_control_title" />
- <CheckBoxPreference
- android:key="promotions"
- android:title="@*android:string/promotional_notification_channel_label"
- settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+ <CheckBoxPreference
+ android:key="promotions"
+ android:title="@*android:string/promotional_notification_channel_label"/>
- <CheckBoxPreference
- android:key="news"
- android:title="@*android:string/news_notification_channel_label"
- settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+ <CheckBoxPreference
+ android:key="news"
+ android:title="@*android:string/news_notification_channel_label"/>
- <CheckBoxPreference
- android:key="social"
- android:title="@*android:string/social_notification_channel_label"
- settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+ <CheckBoxPreference
+ android:key="social"
+ android:title="@*android:string/social_notification_channel_label"/>
- <CheckBoxPreference
- android:key="recs"
- android:title="@*android:string/recs_notification_channel_label"
- settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
+ <CheckBoxPreference
+ android:key="recs"
+ android:title="@*android:string/recs_notification_channel_label" />
+ </PreferenceCategory>
<PreferenceCategory
android:key="notification_bundle_excluded_apps_list"