Merge "Add setting for promoted (live) notifications" into main

This commit is contained in:
Yuri Lin
2024-12-26 10:30:28 -08:00
committed by Android (Google) Code Review
6 changed files with 277 additions and 2 deletions

View File

@@ -8774,6 +8774,13 @@
<!-- App Info > Notifications: Title for section where notifications bundles can be configured [CHAR LIMIT=80]-->
<string name="notification_bundles">Notification bundles</string>
<!-- App Info > Notifications: Title for section controlling whether this app may show notifications in a promoted format [CHAR LIMIT=80] -->
<string name="live_notifications">Live notifications</string>
<!-- App Info > Notifications: Text on the switch to enable or disable an app from showing notifications in a live/promoted format [CHAR LIMIT=50] -->
<string name="live_notifications_switch">Show live info</string>
<!-- App Info > Notifications: Text accompanying the "Show live info" switch explaining the purpose of the setting -->
<string name="live_notifications_desc">Pinned notifications display live info from apps, and always appear on the status bar and lock screen</string>
<!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
<string name="notification_bubbles_title">Bubbles</string>
<!-- Title for the toggle shown on the app-level bubbles page [CHAR LIMIT=60] -->

View File

@@ -30,6 +30,23 @@
<Preference
android:key="block_desc" />
<!-- Whether the app can show promoted notifications -->
<PreferenceCategory
android:title="@string/live_notifications"
android:key="promoted_category"
android:visibility="gone">
<com.android.settingslib.RestrictedSwitchPreference
android:key="promoted_switch"
android:title="@string/live_notifications_switch" />
<Preference
android:key="promoted_desc"
android:summary="@string/live_notifications_desc"
android:selectable="false"/>
</PreferenceCategory>
<!-- Conversations added here -->
<PreferenceCategory
android:title="@string/conversations_category_title"