Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev

This commit is contained in:
James Lemieux 2014-09-30 23:11:36 +00:00 committed by Android (Google) Code Review
commit 69ba565b62

View File

@ -3654,7 +3654,9 @@ public class EmailProvider extends ContentProvider
}
if (colPosMap.containsKey(UIProvider.AccountColumns.CAPABILITIES)) {
values[colPosMap.get(UIProvider.AccountColumns.CAPABILITIES)] =
AccountCapabilities.UNDO | AccountCapabilities.VIRTUAL_ACCOUNT;
AccountCapabilities.UNDO |
AccountCapabilities.VIRTUAL_ACCOUNT |
AccountCapabilities.CLIENT_SANITIZED_HTML;
}
if (colPosMap.containsKey(UIProvider.AccountColumns.FOLDER_LIST_URI)) {
values[colPosMap.get(UIProvider.AccountColumns.FOLDER_LIST_URI)] =