am 045aa057: Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from EmailProvider.

* commit '045aa05777a097717c1a915e66eb9ab671e02d56':
  Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from EmailProvider.
This commit is contained in:
Ray Chen 2014-07-24 18:02:50 +00:00 committed by Android Git Automerger
commit 0b8f7a0e71

View File

@ -2748,6 +2748,8 @@ public class EmailProvider extends ContentProvider
.add(UIProvider.AccountColumns.NAME, AccountColumns.DISPLAY_NAME) .add(UIProvider.AccountColumns.NAME, AccountColumns.DISPLAY_NAME)
.add(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME, .add(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME,
AccountColumns.EMAIL_ADDRESS) AccountColumns.EMAIL_ADDRESS)
.add(UIProvider.AccountColumns.ACCOUNT_ID,
AccountColumns.EMAIL_ADDRESS)
.add(UIProvider.AccountColumns.SENDER_NAME, .add(UIProvider.AccountColumns.SENDER_NAME,
AccountColumns.SENDER_NAME) AccountColumns.SENDER_NAME)
.add(UIProvider.AccountColumns.UNDO_URI, .add(UIProvider.AccountColumns.UNDO_URI,
@ -3639,6 +3641,9 @@ public class EmailProvider extends ContentProvider
values[colPosMap.get(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME)] = values[colPosMap.get(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME)] =
getContext().getString(R.string.mailbox_list_account_selector_combined_view); getContext().getString(R.string.mailbox_list_account_selector_combined_view);
} }
if (colPosMap.containsKey(UIProvider.AccountColumns.ACCOUNT_ID)) {
values[colPosMap.get(UIProvider.AccountColumns.ACCOUNT_ID)] = "Account Id";
}
if (colPosMap.containsKey(UIProvider.AccountColumns.TYPE)) { if (colPosMap.containsKey(UIProvider.AccountColumns.TYPE)) {
values[colPosMap.get(UIProvider.AccountColumns.TYPE)] = "unknown"; values[colPosMap.get(UIProvider.AccountColumns.TYPE)] = "unknown";
} }