am f247d7e0: am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev

* commit 'f247d7e02e4aae32698256a5776f19760d27b0ea':
  Combined view should also display client-side sanitized HTML
This commit is contained in:
James Lemieux 2014-11-02 19:02:44 +00:00 committed by Android Git Automerger
commit 91d415ef4c
1 changed files with 3 additions and 1 deletions

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)] =