From 7349fbff64328100cb5bd878f4d400ccc611ec80 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Tue, 24 Sep 2013 16:39:49 -0700 Subject: [PATCH] Separate the account name from the account manager's account name b/10894178 Change-Id: Ie64ae00e4fd382fb03fc7c87ea91c7aff8fc8f43 --- src/com/android/email/provider/EmailProvider.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 103ac6749..9c5c06ef4 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -2155,6 +2155,8 @@ public class EmailProvider extends ContentProvider { .add(UIProvider.AccountColumns.FULL_FOLDER_LIST_URI, uriWithId("uifullfolders")) .add(UIProvider.AccountColumns.ALL_FOLDER_LIST_URI, uriWithId("uiallfolders")) .add(UIProvider.AccountColumns.NAME, AccountColumns.DISPLAY_NAME) + .add(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME, + AccountColumns.EMAIL_ADDRESS) .add(UIProvider.AccountColumns.UNDO_URI, ("'content://" + EmailContent.AUTHORITY + "/uiundo'")) .add(UIProvider.AccountColumns.URI, uriWithId("uiaccount")) @@ -2956,7 +2958,11 @@ public class EmailProvider extends ContentProvider { } if (colPosMap.containsKey(UIProvider.AccountColumns.NAME)) { values[colPosMap.get(UIProvider.AccountColumns.NAME)] = getContext().getString( - R.string.mailbox_list_account_selector_combined_view); + R.string.mailbox_list_account_selector_combined_view); + } + if (colPosMap.containsKey(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME)) { + values[colPosMap.get(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME)] = + getContext().getString(R.string.mailbox_list_account_selector_combined_view); } if (colPosMap.containsKey(UIProvider.AccountColumns.TYPE)) { values[colPosMap.get(UIProvider.AccountColumns.TYPE)] = "unknown";