ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am bc565347: Merge "Separate the account name from the account manager\'s account name" into jb-ub-mail-ur10

Browse Source 
* commit 'bc5653471c11d8d2678c22bda8b6ae33e65650a1':
  Separate the account name from the account manager's account name
This commit is contained in:
Tony Mantler 2013-09-25 15:13:39 -07:00 committed by Android Git Automerger
commit b5d2f499d4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/email/provider/EmailProvider.java
View File

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