From 7b0a8b68157eea62c1e912b3db4f86d88ae43103 Mon Sep 17 00:00:00 2001
From: Alison Cichowlas <asc@google.com>
Date: Fri, 16 Jun 2017 13:56:56 -0400
Subject: [PATCH] Notification settings update.

- Use "what happens" descriptors instead of priority level names in summary
- Group some settings under Advanced header.

Bug: 62705435
Test: make RunSettingsRoboTests; manual verification
Change-Id: Iac31575d894d7f3532c8e631ee9d77ee21830b29
---
 ...upgraded_channel_notification_settings.xml | 36 +++++++++++--------
 .../notification/AppNotificationSettings.java |  8 ++---
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/res/xml/upgraded_channel_notification_settings.xml b/res/xml/upgraded_channel_notification_settings.xml
index 7925bb78ebc..c274abea930 100644
--- a/res/xml/upgraded_channel_notification_settings.xml
+++ b/res/xml/upgraded_channel_notification_settings.xml
@@ -37,28 +37,34 @@
         android:title="@string/notification_vibrate_title"
         settings:useAdditionalSummary="true" />
 
-    <!-- Show badge -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="badge"
-        android:title="@string/notification_channel_badge_title"
-        settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
+    <PreferenceCategory
+        android:title="@string/advanced_apps">
 
-    <!-- Lights -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="lights"
-        android:title="@string/notification_show_lights_title"
-        settings:useAdditionalSummary="true" />
+        <!-- Show badge -->
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="badge"
+            android:title="@string/notification_channel_badge_title"
+            settings:useAdditionalSummary="true"
+            settings:restrictedSwitchSummary="@string/enabled_by_admin" />
 
-    <!-- Visibility Override -->
-    <com.android.settings.notification.RestrictedDropDownPreference
+        <!-- Lights -->
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="lights"
+            android:title="@string/notification_show_lights_title"
+            settings:useAdditionalSummary="true" />
+
+        <!-- Visibility Override -->
+        <com.android.settings.notification.RestrictedDropDownPreference
             android:key="visibility_override"
             android:title="@string/app_notification_visibility_override_title" />
 
-    <!-- Bypass DND -->
-    <com.android.settingslib.RestrictedSwitchPreference
+        <!-- Bypass DND -->
+        <com.android.settingslib.RestrictedSwitchPreference
             android:key="bypass_dnd"
             android:title="@string/app_notification_override_dnd_title"
             android:summary="@string/app_notification_override_dnd_summary"
             settings:useAdditionalSummary="true" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index deb5c4d2a64..5cac0bb4cf0 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -338,15 +338,15 @@ public class AppNotificationSettings extends NotificationSettingsBase {
             case NotificationManager.IMPORTANCE_NONE:
                 return getContext().getString(R.string.notification_toggle_off);
             case NotificationManager.IMPORTANCE_MIN:
-                return getContext().getString(R.string.notification_channel_summary_min);
+                return getContext().getString(R.string.notification_importance_min);
             case NotificationManager.IMPORTANCE_LOW:
-                return getContext().getString(R.string.notification_channel_summary_low);
+                return getContext().getString(R.string.notification_importance_low);
             case NotificationManager.IMPORTANCE_DEFAULT:
-                return getContext().getString(R.string.notification_channel_summary_default);
+                return getContext().getString(R.string.notification_importance_default);
             case NotificationManager.IMPORTANCE_HIGH:
             case NotificationManager.IMPORTANCE_MAX:
             default:
-                return getContext().getString(R.string.notification_channel_summary_high);
+                return getContext().getString(R.string.notification_importance_high);
         }
 
     }