From 90e27a4893effb17e19aef973df02333eec9614a Mon Sep 17 00:00:00 2001
From: John Spurlock <jspurlock@google.com>
Date: Mon, 8 Jun 2015 16:50:36 -0400
Subject: [PATCH] Settings: Update notification listener user prompt strings.

Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
---
 res/values/strings.xml                                        | 11 +++++------
 .../android/settings/notification/ManagedServiceSettings.java |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4978d575d1..549a80953c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6059,19 +6059,18 @@
     </plurals>
 
     <!-- String to show in the list of notification listeners, when none is installed -->
-    <string name="no_notification_listeners">No notification listeners are installed.</string>
+    <string name="no_notification_listeners">No installed apps have requested notification access.</string>
 
     <!-- Title for a warning message about security implications of enabling a notification
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
-    <string name="notification_listener_security_warning_title">Enable
+    <string name="notification_listener_security_warning_title">Allow notification access for
          <xliff:g id="service" example="NotificationReader">%1$s</xliff:g>?</string>
     <!-- Summary for a warning message about security implications of enabling a notification
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="notification_listener_security_warning_summary">
-        <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to
-        read all notifications posted by the system or any installed app, which may include personal
-        information such as contact names and the text of messages sent to you. It will also be able
-        to dismiss these notifications or touch action buttons within them.
+        <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to read all notifications,
+        including personal information such as contact names and the text of messages you receive.
+        It will also be able to dismiss notifications or trigger action buttons they contain.
     </string>
 
     <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/notification/ManagedServiceSettings.java b/src/com/android/settings/notification/ManagedServiceSettings.java
index 660ea5a1f3..e9ff428aa5 100644
--- a/src/com/android/settings/notification/ManagedServiceSettings.java
+++ b/src/com/android/settings/notification/ManagedServiceSettings.java
@@ -160,13 +160,13 @@ public abstract class ManagedServiceSettings extends SettingsPreferenceFragment
                     .setMessage(summary)
                     .setTitle(title)
                     .setCancelable(true)
-                    .setPositiveButton(android.R.string.ok,
+                    .setPositiveButton(R.string.allow,
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
                                     mServiceListing.setEnabled(cn, true);
                                 }
                             })
-                    .setNegativeButton(android.R.string.cancel,
+                    .setNegativeButton(R.string.deny,
                             new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
                                     // pass
-- 
2.11.0