am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev

* commit '9a5836107664b796c3ae37c25c89cbf070243edb':
  Settings: Update notification listener user prompt strings.
This commit is contained in:
John Spurlock
2015-06-08 21:12:23 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 8 deletions

View File

@@ -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] -->

View File

@@ -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