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

This commit is contained in:
TreeHugger Robot
2019-04-19 00:57:32 +00:00
committed by Android (Google) Code Review
3 changed files with 29 additions and 14 deletions

Binary file not shown.

View File

@@ -7795,17 +7795,20 @@
<!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] --> <!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
<string name="profile_section_header">Work notifications</string> <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] --> <!-- 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] --> <!-- 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] --> <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
<string name="asst_capabilities_actions_replies_title">Smart actions and replies</string> <string name="asst_capabilities_actions_replies_title">Smart actions and replies</string>
<!-- Configure Notifications: setting summary [CHAR LIMIT=200] --> <!-- 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] --> <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
<string name="hide_silent_icons_title">Hide silent notification status icons</string> <string name="hide_silent_icons_title">Hide silent notification status icons</string>

View File

@@ -19,6 +19,23 @@
android:title="@string/configure_notification_settings" android:title="@string/configure_notification_settings"
android:key="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 <SwitchPreference
android:key="asst_capability_prioritizer" android:key="asst_capability_prioritizer"
android:title="@string/asst_capability_prioritizer_title" android:title="@string/asst_capability_prioritizer_title"
@@ -30,12 +47,7 @@
android:title="@string/asst_capabilities_actions_replies_title" android:title="@string/asst_capabilities_actions_replies_title"
android:summary="@string/asst_capabilities_actions_replies_summary" android:summary="@string/asst_capabilities_actions_replies_summary"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" /> settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
</PreferenceCategory>
<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" android:key="configure_notifications_advanced"