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

Combine the "Permission Requested" title and subtitle into one string.

Browse Source 
The translators don't get the strings in order, so having a single sentence
split across two strings makes it difficult to get good translations.
This commit is contained in:
Eric Fischer
2009-08-31 17:58:06 -07:00
parent fc5f10265f
commit ee452ee535
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,
0 /* when */);
final CharSequence subtitleFormatString =
mContext.getText(R.string.permission_request_notification_subtitle);
final String titleAndSubtitle =
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,
mContext.getText(R.string.permission_request_notification_title),
String.format(subtitleFormatString.toString(), account.name),
title, subtitle,
PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT));
((NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE))
.notify(getCredentialPermissionNotificationId(account, authTokenType, uid), n);