Merge "Settings: Update notification listener user prompt strings." into mnc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4978d57..549a809 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 660ea5a..e9ff428 100644
--- a/src/com/android/settings/notification/ManagedServiceSettings.java
+++ b/src/com/android/settings/notification/ManagedServiceSettings.java
@@ -160,13 +160,13 @@
.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