Merge "Merge bundle global & type preference controllers." into main
This commit is contained in:
@@ -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"
|
||||
|
Reference in New Issue
Block a user