Hook up settings, draft, sendmail in combined inbox

Change-Id: I91fe4799786ade66e6965056f01e2caf4adca705
This commit is contained in:
Marc Blank 2012-04-06 09:39:42 -07:00
parent 0d3f91560a
commit 948b008f9a

View File

@ -2516,20 +2516,29 @@ outer:
} }
private void addCombinedAccountRow(MatrixCursor mc) { private void addCombinedAccountRow(MatrixCursor mc) {
long id = Account.getDefaultAccountId(getContext());
if (id == Account.NO_ACCOUNT) return;
String idString = Long.toString(id);
Object[] values = new Object[UIProvider.ACCOUNTS_PROJECTION.length]; Object[] values = new Object[UIProvider.ACCOUNTS_PROJECTION.length];
values[UIProvider.ACCOUNT_ID_COLUMN] = 0; values[UIProvider.ACCOUNT_ID_COLUMN] = 0;
values[UIProvider.ACCOUNT_FOLDER_LIST_URI_COLUMN] = values[UIProvider.ACCOUNT_FOLDER_LIST_URI_COLUMN] =
combinedUriString("uifolders", COMBINED_ACCOUNT_ID_STRING); combinedUriString("uifolders", COMBINED_ACCOUNT_ID_STRING);
values[UIProvider.ACCOUNT_NAME_COLUMN] = getContext().getString( values[UIProvider.ACCOUNT_NAME_COLUMN] = getContext().getString(
R.string.mailbox_list_account_selector_combined_view); R.string.mailbox_list_account_selector_combined_view);
values[UIProvider.ACCOUNT_SAVE_DRAFT_URI_COLUMN] = null; values[UIProvider.ACCOUNT_SAVE_DRAFT_URI_COLUMN] =
values[UIProvider.ACCOUNT_SEND_MESSAGE_URI_COLUMN] = null; combinedUriString("uisavedraft", idString);
values[UIProvider.ACCOUNT_SEND_MESSAGE_URI_COLUMN] =
combinedUriString("uisendmail", idString);
values[UIProvider.ACCOUNT_UNDO_URI_COLUMN] = null; values[UIProvider.ACCOUNT_UNDO_URI_COLUMN] = null;
values[UIProvider.ACCOUNT_SETTINGS_QUERY_URI_COLUMN] = values[UIProvider.ACCOUNT_SETTINGS_QUERY_URI_COLUMN] =
combinedUriString("uisettings", COMBINED_ACCOUNT_ID_STRING); combinedUriString("uisettings", COMBINED_ACCOUNT_ID_STRING);
values[UIProvider.ACCOUNT_URI_COLUMN] = values[UIProvider.ACCOUNT_URI_COLUMN] =
combinedUriString("uiaccount", COMBINED_ACCOUNT_ID_STRING); combinedUriString("uiaccount", COMBINED_ACCOUNT_ID_STRING);
values[UIProvider.ACCOUNT_MIME_TYPE_COLUMN] = EMAIL_APP_MIME_TYPE;; values[UIProvider.ACCOUNT_MIME_TYPE_COLUMN] = EMAIL_APP_MIME_TYPE;;
values[UIProvider.ACCOUNT_SETTINGS_INTENT_URI_COLUMN] =
getExternalUriString("settings", COMBINED_ACCOUNT_ID_STRING);
values[UIProvider.ACCOUNT_COMPOSE_INTENT_URI_COLUMN] =
getExternalUriString("compose", idString);
mc.addRow(values); mc.addRow(values);
} }