From ef5e760f7e1c37374a189c018e09d09fe6411ee6 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Tue, 11 Jun 2024 14:18:16 +0000
Subject: [PATCH] Update Settings Page for Avalanche Suppression/Adaptive
 Notifications

Update the Settings Page for the Avalanche
visual and auditory Suppression - now called adaptive notifications.

Bug: 270456865
Fixes: 346528029
Fixes: 345722296
Test: PoliteNotificationPreferenceControllerTest
Flag: com.android.server.notification.polite_notifications
Change-Id: I97fcda4b8a8795ed05044e325cf038ea31f99ae9
---
 res/values/strings.xml                      |  6 ++--
 res/xml/configure_notification_settings.xml | 35 +++++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1f5c11d82b3..7d240d6ef44 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8723,9 +8723,9 @@
     <string name="notif_listener_more_settings_desc">More settings are available inside this app</string>
 
     <!-- Title for Polite Notifications setting  [CHAR LIMIT=45]-->
-    <string name="notification_polite_title">Cooldown</string>
-    <string name="notification_polite_main_control_title">Use Cooldown</string>
-    <string name="notification_polite_description">When you get many notifications within a short time span, your device will minimize sound interruptions and pop-ups on the screen. Calls, alarms, and priority conversations will still alert as notmal, and all delivered notifications are easy to find in the Shade.</string>
+    <string name="notification_polite_title">Adaptive Notifications</string>
+    <string name="notification_polite_main_control_title">Use adaptive notifications</string>
+    <string name="notification_polite_description">When you get many notifications within a short time, your phone will lower volume and minimize pop-ups on screen for up to two minutes. Calls, alarms, and priority conversations still vibrate, make a sound, or show up on the screen, and all notifications are easy to find when you pull down from the top of the screen.</string>
     <string name="notification_polite_work">Apply to work profiles</string>
     <string name="notification_polite_work_summary">Apply to work profile apps</string>
 
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 7fcf85e17f7..b673a0839b0 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -116,9 +116,19 @@
     <PreferenceCategory
         android:key="advanced_section_header"
         android:title="@string/advanced_section_header">
+
+        <!--Adaptive Notifications-->
+        <Preference
+            android:fragment="com.android.settings.notification.PoliteNotificationsPreferenceFragment"
+            android:key="polite_notifications_preference"
+            android:order="17"
+            android:persistent="false"
+            android:title="@string/notification_polite_title"
+            settings:controller="com.android.settings.notification.PoliteNotificationsPreferenceController" />
+
         <com.android.settingslib.RestrictedPreference
             android:key="zen_mode_notifications"
-            android:order="17"
+            android:order="18"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
             android:fragment="com.android.settings.notification.zen.ZenModeSettings"
@@ -127,7 +137,7 @@
 
         <SwitchPreferenceCompat
             android:key="lock_screen_show_only_unseen_notifs"
-            android:order="18"
+            android:order="19"
             android:title="@string/unseen_notifs_lock_screen"
             android:summary="@string/unseen_notifs_lock_screen_summary"
             settings:controller="com.android.settings.notification.ShowOnlyUnseenNotificationsOnLockscreenPreferenceController"
@@ -136,7 +146,7 @@
         <Preference
             android:fragment="com.android.settings.accessibility.FlashNotificationsPreferenceFragment"
             android:key="flash_notifications_preference"
-            android:order="19"
+            android:order="20"
             android:persistent="false"
             android:title="@string/flash_notifications_title"
             settings:searchable="false"
@@ -144,7 +154,7 @@
 
         <com.android.settingslib.RestrictedPreference
             android:key="app_and_notif_cell_broadcast_settings"
-            android:order="20"
+            android:order="21"
             android:title="@string/cell_broadcast_settings"
             settings:useAdminDisabledSummary="true">
             <intent
@@ -155,43 +165,36 @@
 
         <SwitchPreferenceCompat
              android:key="silent_icons"
-             android:order="21"
+             android:order="22"
              android:title="@string/silent_notifications_status_bar"
              settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
 
         <SwitchPreferenceCompat
             android:key="show_snooze_options"
-            android:order="22"
+            android:order="23"
             android:title="@string/snooze_options_title"
             settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
 
         <!-- Notification badging -->
         <SwitchPreferenceCompat
             android:key="notification_badging"
-            android:order="23"
+            android:order="24"
             android:title="@string/notification_badging_title"
             settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
 
         <!-- Pulse notification light, on devices that support it -->
         <SwitchPreferenceCompat
             android:key="notification_pulse"
-            android:order="24"
+            android:order="25"
             android:title="@string/notification_pulse_title"
             settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
 
         <SwitchPreferenceCompat
             android:key="notification_assistant"
-            android:order="25"
+            android:order="26"
             android:title="@string/notification_assistant_title"
             android:summary="@string/notification_assistant_summary"
             settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
 
-        <Preference
-            android:fragment="com.android.settings.notification.PoliteNotificationsPreferenceFragment"
-            android:key="polite_notifications_preference"
-            android:order="26"
-            android:persistent="false"
-            android:title="@string/notification_polite_title"
-            settings:controller="com.android.settings.notification.PoliteNotificationsPreferenceController" />
     </PreferenceCategory>
 </PreferenceScreen>