PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reorder the new notification settings page" into sc-dev am: afaee1a202

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13616954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac47748ccc1a79ea8c59371919fc6b7e99ca44fd
This commit is contained in:
TreeHugger Robot
2021-02-19 17:16:12 +00:00
committed by Automerger Merge Worker
parent 60927a0192 afaee1a202
commit 1e12e6a71f
2 changed files with 56 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/strings.xml
View File

@@ -8306,6 +8306,9 @@
<!-- Configure Notifications Settings title. [CHAR LIMIT=30] --> <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->
<string name="configure_notification_settings">Notifications</string> <string name="configure_notification_settings">Notifications</string>
<!-- notification header - settings for conversation type notifications -->
<string name="conversation_notifs_category">Conversation</string>
<!-- notification header - apps that have recently sent notifications --> <!-- notification header - apps that have recently sent notifications -->
<string name="recent_notifications">Recently sent</string> <string name="recent_notifications">Recently sent</string>
@@ -8313,7 +8316,7 @@
<string name="recent_notifications_see_all_title">See all from last 7 days</string> <string name="recent_notifications_see_all_title">See all from last 7 days</string>
<!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] --> <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->
<string name="advanced_section_header">Advanced</string> <string name="advanced_section_header">General</string>
<!-- 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>
@@ -8480,8 +8483,8 @@
<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] --> <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
<string name="notification_pulse_title">Blink light</string> <string name="notification_pulse_title">Blink light</string>
<!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=60] --> <!-- Configure Notifications: Title for the option controlling privacy options for notifications. [CHAR LIMIT=60] -->
<string name="lock_screen_notifications_title">Notifications on lock screen</string> <string name="lock_screen_notifications_title">Privacy</string>
<!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] --> <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->
<string name="lockscreen_bypass_title">Skip lock screen</string> <string name="lockscreen_bypass_title">Skip lock screen</string>

134
res/xml/configure_notification_settings_v2.xml
View File

@@ -18,59 +18,27 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/configure_notification_settings"> android:title="@string/configure_notification_settings">
<com.android.settings.widget.VideoPreference <PreferenceCategory
android:key="notification_model_illustration" android:key="conversation_category"
android:title="@string/summary_placeholder" android:title="@string/conversation_notifs_category">
settings:animation="@raw/notification_interruption_model" <Preference
settings:controller="com.android.settings.widget.VideoPreferenceController" android:key="conversations"
android:persistent="false" /> android:title="@string/conversations_category_title"
settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
<Preference android:fragment="com.android.settings.notification.app.ConversationListSettings"
android:key="notification_history" />
android:title="@string/notification_history" <Preference
android:summary="@string/notification_history_summary" android:key="notification_bubbles"
settings:allowDividerAbove="true" android:title="@string/notification_bubbles_title"
settings:allowDividerBelow="false" android:summary="@string/notifications_bubble_setting_on_summary"
android:order="2"> settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
<intent android:fragment="com.android.settings.notification.BubbleNotificationSettings"
android:action="android.intent.action.MAIN" />
android:targetPackage="com.android.settings" </PreferenceCategory>
android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
</Preference>
<Preference
android:key="conversations"
android:title="@string/conversations_category_title"
android:order="3"
settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
android:fragment="com.android.settings.notification.app.ConversationListSettings"
/>
<Preference
android:key="notification_bubbles"
android:title="@string/notification_bubbles_title"
android:summary="@string/notifications_bubble_setting_on_summary"
android:order="4"
settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
android:fragment="com.android.settings.notification.BubbleNotificationSettings"
/>
<com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings"
android:order="5"
settings:useAdminDisabledSummary="true">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="@string/cell_broadcast_receiver_package"
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
</com.android.settingslib.RestrictedPreference>
<PreferenceCategory <PreferenceCategory
android:key="recent_notifications_category" android:key="recent_notifications_category"
android:title="@string/recent_notifications" android:title="@string/recent_notifications">
settings:allowDividerAbove="true"
android:order="6">
<!-- Placeholder for a list of recent apps --> <!-- Placeholder for a list of recent apps -->
<!-- See all apps button --> <!-- See all apps button -->
@@ -78,7 +46,6 @@
android:key="all_notifications" android:key="all_notifications"
android:title="@string/notifications_title" android:title="@string/notifications_title"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications" android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
android:order="7"
settings:searchable="false"> settings:searchable="false">
<extra <extra
android:name="classname" android:name="classname"
@@ -86,11 +53,18 @@
</Preference> </Preference>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="configure_notifications_lock" android:key="configure_notifications_lock"
android:title="@string/lock_screen_notifications_title" android:title="@string/lock_screen_notifications_title">
android:order="10"> <Preference
android:key="notification_history"
android:title="@string/notification_history"
android:summary="@string/notification_history_summary">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
</Preference>
<!-- When device is locked --> <!-- When device is locked -->
<com.android.settings.RestrictedListPreference <com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications" android:key="lock_screen_notifications"
@@ -120,14 +94,29 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="configure_notifications_advanced" android:key="advanced_section_header"
android:order="15" android:title="@string/advanced_section_header">
settings:initialExpandedChildrenCount="0"> <com.android.settingslib.RestrictedPreference
android:key="zen_mode_notifications"
android:title="@string/zen_mode_settings_title"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.notification.zen.ZenModeSettings"
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
/>
<com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings"
settings:useAdminDisabledSummary="true">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="@string/cell_broadcast_receiver_package"
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
</com.android.settingslib.RestrictedPreference>
<SwitchPreference <SwitchPreference
android:key="silent_icons" android:key="silent_icons"
android:title="@string/silent_notifications_status_bar" android:title="@string/silent_notifications_status_bar"
settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/> settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
<SwitchPreference <SwitchPreference
android:key="show_snooze_options" android:key="show_snooze_options"
@@ -140,33 +129,10 @@
android:title="@string/notification_badging_title" android:title="@string/notification_badging_title"
settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/> settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
<!-- Pulse notification light --> <!-- Pulse notification light, on devices that support it -->
<SwitchPreference <SwitchPreference
android:key="notification_pulse" android:key="notification_pulse"
android:title="@string/notification_pulse_title" android:title="@string/notification_pulse_title"
settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/> settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
<!-- Default notification ringtone -->
<com.android.settings.DefaultRingtonePreference
android:key="notification_default_ringtone"
android:title="@string/notification_ringtone_title"
android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder"
android:ringtoneType="notification"
settings:searchable="false"/>
<Preference
android:key="gesture_swipe_down_fingerprint_notifications"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
<com.android.settingslib.RestrictedPreference
android:key="zen_mode_notifications"
android:title="@string/zen_mode_settings_title"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.notification.zen.ZenModeSettings"
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
settings:allowDividerAbove="false"/>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>