Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 764916d0: Merge change 23383 into eclair

Browse Source 
Merge commit '764916d01b779ccc8064946c6ba2962fe063ed86' into eclair-plus-aosp

* commit '764916d01b779ccc8064946c6ba2962fe063ed86':
  Combine the "Permission Requested" title and subtitle into one string.
This commit is contained in:
Eric Fischer
2009-09-16 11:40:37 -07:00
committed by Android Git Automerger
parent c05a7f6216 764916d01b
commit 5a7477cee8
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/accounts/AccountManagerService.java
View File

@@ -714,11 +714,14 @@ public class AccountManagerService extends IAccountManager.Stub {
Notification n = new Notification(android.R.drawable.stat_sys_warning, null, Notification n = new Notification(android.R.drawable.stat_sys_warning, null,
0 /* when */); 0 /* when */);
final CharSequence subtitleFormatString = final String titleAndSubtitle =
mContext.getText(R.string.permission_request_notification_subtitle); mContext.getString(R.string.permission_request_notification_with_subtitle,
account.name);
final int index = titleAndSubtitle.indexOf('\n');
final String title = titleAndSubtitle.substring(0, index);
final String subtitle = titleAndSubtitle.substring(index + 1);
n.setLatestEventInfo(mContext, n.setLatestEventInfo(mContext,
mContext.getText(R.string.permission_request_notification_title), title, subtitle,
String.format(subtitleFormatString.toString(), account.name),
PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT)); PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT));
((NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE)) ((NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE))
.notify(getCredentialPermissionNotificationId(account, authTokenType, uid), n); .notify(getCredentialPermissionNotificationId(account, authTokenType, uid), n);

2
core/res/res/values/strings.xml
View File

@@ -1962,7 +1962,7 @@
<string name="allow">Allow</string> <string name="allow">Allow</string>
<string name="deny">Deny</string> <string name="deny">Deny</string>
<string name="permission_request_notification_title">Permission Requested</string> <string name="permission_request_notification_title">Permission Requested</string>
<string name="permission_request_notification_subtitle">for account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g></string> <string name="permission_request_notification_with_subtitle">Permission Requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g></string>
<!-- Label to show for a service that is running because it is an input method. --> <!-- Label to show for a service that is running because it is an input method. -->
<string name="input_method_binding_label">Input method</string> <string name="input_method_binding_label">Input method</string>