Merge "Merge bundle global & type preference controllers." into main

This commit is contained in:
Yuri Lin
2025-03-24 12:13:24 -07:00
committed by Android (Google) Code Review
9 changed files with 427 additions and 439 deletions

View File

@@ -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">
<CheckBoxPreference
android:key="promotions"
android:title="@*android:string/promotional_notification_channel_label"
settings:controller="com.android.settings.notification.BundleTypePreferenceController"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="global_pref"
android:title="@string/notification_bundle_main_control_title" />
<CheckBoxPreference
android:key="news"
android:title="@*android:string/news_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="social"
android:title="@*android:string/social_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="recs"
android:title="@*android:string/recs_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" />
</PreferenceCategory>
<PreferenceCategory
android:key="notification_bundle_excluded_apps_list"