Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51d16f23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updates to main notification page" into qt-dev

parents 8bfc277f e51128f1

res/raw/notification_interruption_model.mp4

0 → 100644
+444 KiB

File added.

No diff preview for this file type.

View file

res/values/strings.xml

+6 −3
Original line number Diff line number Diff line
@@ -7795,17 +7795,20 @@ 
    <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->

    <string name="profile_section_header">Work notifications</string>













    <!-- Configure Notifications: section header for prioritizer settings  [CHAR LIMIT=80] -->













    <string name="smart_notifications_title">Smart notifications</string>



























    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->













    <string name="asst_capability_prioritizer_title">Automatic Notification Prioritizer</string>













    <string name="asst_capability_prioritizer_title">Automatic Prioritization</string>





























    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->













    <string name="asst_capability_prioritizer_summary">Automatically silence and demote less important notifications</string>













    <string name="asst_capability_prioritizer_summary">Automatically de-prioritize less important notifications to the gentle section</string>





























    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->















    <string name="asst_capabilities_actions_replies_title">Smart actions and replies</string>





























    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->













    <string name="asst_capabilities_actions_replies_summary">Automatically add contextual notification actions and quick replies to notifications</string>













    <string name="asst_capabilities_actions_replies_summary">Automatically add suggested actions and replies to notifications</string>





























    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->















    <string name="hide_silent_icons_title">Hide silent notification status icons</string>

























res/xml/configure_notification_settings.xml



+23
−11




























Original line number
Diff line number
Diff line








@@ -19,6 +19,23 @@













                  android:title="@string/configure_notification_settings"















                  android:key="configure_notification_settings">





























    <com.android.settings.widget.VideoPreference













        android:key="notification_model_illustration"













        android:title="@string/summary_placeholder"













        settings:animation="@raw/notification_interruption_model"













        settings:controller="com.android.settings.widget.VideoPreferenceController"













        android:persistent="false" />



























    <SwitchPreference













        android:key="hide_silent_icons"













        android:title="@string/hide_silent_icons_title"













        android:summary="@string/hide_silent_icons_summary"













        settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController" />



























    <PreferenceCategory













        android:key="configure_notifications_smart"













        android:title="@string/smart_notifications_title"













        android:order="3">















        <SwitchPreference















            android:key="asst_capability_prioritizer"















            android:title="@string/asst_capability_prioritizer_title"









@@ -30,12 +47,7 @@













            android:title="@string/asst_capabilities_actions_replies_title"















            android:summary="@string/asst_capabilities_actions_replies_summary"















            settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />



























    <SwitchPreference













        android:key="hide_silent_icons"













        android:title="@string/hide_silent_icons_title"













        android:summary="@string/hide_silent_icons_summary"













        settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController" />













    </PreferenceCategory>































    <PreferenceCategory















        android:key="configure_notifications_advanced"