Merge "NLS settings polish" into sc-dev am: 78e8175479

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4b488a43131fc6c8b9ab8334519045007be73ac

res/xml/configure_notification_settings_v2.xml

@@ -23,12 +23,14 @@
         android:title="@string/conversation_notifs_category">
         <Preference
             android:key="conversations"
+            android:order="1"
             android:title="@string/conversations_category_title"
             settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
             android:fragment="com.android.settings.notification.app.ConversationListSettings"
         />
         <Preference
             android:key="notification_bubbles"
+            android:order="2"
             android:title="@string/notification_bubbles_title"
             android:summary="@string/notifications_bubble_setting_on_summary"
             settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
@@ -44,6 +46,7 @@
         <!-- See all apps button -->
         <Preference
             android:key="all_notifications"
+            android:order="10"
             android:title="@string/notifications_title"
             android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
             settings:searchable="false">
@@ -58,6 +61,7 @@
         android:title="@string/lock_screen_notifications_title">
         <Preference
             android:key="notification_history"
+            android:order="11"
             android:title="@string/notification_history"
             android:summary="@string/notification_history_summary">
             <intent
@@ -65,27 +69,38 @@
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
         </Preference>
+        <Preference
+            android:key="notification_access"
+            android:order="12"
+            android:title="@string/manage_notification_access_title"
+            android:summary="@string/manage_notification_access_summary"
+            android:fragment="com.android.settings.notification.NotificationAccessSettings"
+            settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />
         <!-- When device is locked -->
         <com.android.settings.RestrictedListPreference
             android:key="lock_screen_notifications"
+            android:order="13"
             android:title="@string/lock_screen_notifs_title"
             android:singleLineTitle="false"
             android:summary="@string/summary_placeholder" />
 
         <SwitchPreference
             android:key="lock_screen_redact"
+            android:order="14"
             android:title="@string/lock_screen_notifs_redact"
             android:summary="@string/lock_screen_notifs_redact_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <SwitchPreference
             android:key="lock_screen_work_redact"
+            android:order="15"
             android:title="@string/lock_screen_notifs_redact_work"
             android:summary="@string/lock_screen_notifs_redact_work_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <SwitchPreference
             android:key="notification_lockscreen_bypass"
+            android:order="16"
             android:title="@string/lockscreen_bypass_title"
             android:summary="@string/lockscreen_bypass_summary"
             settings:searchable="false"
@@ -98,6 +113,7 @@
         android:title="@string/advanced_section_header">
         <com.android.settingslib.RestrictedPreference
             android:key="zen_mode_notifications"
+            android:order="17"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
             android:fragment="com.android.settings.notification.zen.ZenModeSettings"
@@ -105,6 +121,7 @@
         />
         <com.android.settingslib.RestrictedPreference
             android:key="app_and_notif_cell_broadcast_settings"
+            android:order="18"
             android:title="@string/cell_broadcast_settings"
             settings:useAdminDisabledSummary="true">
             <intent
@@ -115,23 +132,27 @@
 
         <SwitchPreference
              android:key="silent_icons"
+             android:order="19"
              android:title="@string/silent_notifications_status_bar"
              settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
 
         <SwitchPreference
             android:key="show_snooze_options"
+            android:order="20"
             android:title="@string/snooze_options_title"
             settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
 
         <!-- Notification badging -->
         <SwitchPreference
             android:key="notification_badging"
+            android:order="21"
             android:title="@string/notification_badging_title"
             settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
 
         <!-- Pulse notification light, on devices that support it -->
         <SwitchPreference
             android:key="notification_pulse"
+            android:order="22"
             android:title="@string/notification_pulse_title"
             settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
     </PreferenceCategory>

res/xml/notification_access_bridged_apps_settings.xml

@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="nonbridged_apps"
-    android:title="@string/notif_listener_excluded_app_title"
+    android:title="@string/notif_listener_excluded_app_screen_title"
     settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController"
     settings:searchable="false">
 </PreferenceScreen>

res/xml/notification_access_permission_details.xml

@@ -34,27 +34,32 @@
     <CheckBoxPreference
         android:key="type_filter_ongoing"
         android:title="@string/notif_type_ongoing"
+        android:summary="@string/notif_type_ongoing_summary"
         android:icon="@drawable/ic_ongoing_notification"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.OngoingTypeFilterPreferenceController"/>
     <CheckBoxPreference
         android:key="type_filter_conversation"
         android:title="@string/notif_type_conversation"
+        android:summary="@string/notif_type_conversation_summary"
         android:icon="@drawable/ic_promote_conversation"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ConversationTypeFilterPreferenceController"/>
     <CheckBoxPreference
         android:key="type_filter_alerting"
         android:title="@string/notif_type_alerting"
+        android:summary="@string/notif_type_alerting_summary"
         android:icon="@drawable/ic_notification_alert"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.AlertingTypeFilterPreferenceController"/>
     <CheckBoxPreference
         android:key="type_filter_silent"
         android:title="@string/notif_type_silent"
+        android:summary="@string/notif_type_silent_summary"
         android:icon="@drawable/ic_notification_silence"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.SilentTypeFilterPreferenceController"/>
 
     <Preference
         android:key="bridged_apps"
         android:title="@string/notif_listener_excluded_app_title"
+        android:summary="@string/notif_listener_excluded_app_summary"
         android:fragment="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsSettings"
         settings:searchable="false"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController" />