From 2c955bbae2b68005746827c9dd86568ac9197043 Mon Sep 17 00:00:00 2001 From: Chloris Kuo Date: Fri, 19 Mar 2021 07:00:45 -0700 Subject: [PATCH] NAS Setting Migration Change NAS setting to a toggle setting and move the settings to Notifications/General Bug: 173106358 Test: tested manually on device, make RunSettingsRoboTests Change-Id: I1ba1214511dceea6faf5fb39692d920e761b33d8 --- AndroidManifest.xml | 2 +- res/values/strings.xml | 15 ++- res/xml/configure_notification_settings.xml | 5 + .../configure_notification_settings_v2.xml | 6 + res/xml/special_access.xml | 7 -- .../ConfigureNotificationSettings.java | 14 +++ .../NotificationAssistantDialogFragment.java | 71 +++++++++++ ...ficationAssistantPreferenceController.java | 70 +++++++---- .../notification/NotificationBackend.java | 19 ++- ...tificationAssistantDialogFragmentTest.java | 69 +++++++++++ ...tionAssistantPreferenceControllerTest.java | 112 ++++++++++++------ 11 files changed, 315 insertions(+), 75 deletions(-) create mode 100644 src/com/android/settings/notification/NotificationAssistantDialogFragment.java create mode 100644 tests/robotests/src/com/android/settings/notification/NotificationAssistantDialogFragmentTest.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ce80fc5c403..2e7673eece1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2631,7 +2631,7 @@ + android:value="com.android.settings.notification.ConfigureNotificationSettings" /> %d apps can read notifications - - Adaptive Notifications + + Enhanced notifications + + Get suggested actions, replies, and more None @@ -9051,10 +9053,11 @@ - %1$s will be able to read all notifications, - including personal information such as contact names and the text of messages you receive. - This app will also be able to dismiss notifications or take action on buttons in notifications, including answering phone calls. - \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings. + Enhanced notifications can read all notification content, + including personal information like contact names and messages. + This feature can also dismiss notifications or take actions on buttons in notifications, + such as answering phone calls. + \n\nThis feature can also turn Priority mode on or off and change related settings. + + diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml index 83c23b5305a..892c3eb7455 100644 --- a/res/xml/special_access.xml +++ b/res/xml/special_access.xml @@ -80,13 +80,6 @@ android:value="com.android.settings.Settings$WriteSettingsActivity" /> - -