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

* commit '826e61c003e2b2c66865e6b2d62aa0cfa39b5c36':
  Combined view should also display client-side sanitized HTML
This commit is contained in:
James Lemieux 2014-11-02 17:30:04 +00:00 committed by Android Git Automerger
commit c909ad1654

View File

@ -3654,7 +3654,9 @@ public class EmailProvider extends ContentProvider
} }
if (colPosMap.containsKey(UIProvider.AccountColumns.CAPABILITIES)) { if (colPosMap.containsKey(UIProvider.AccountColumns.CAPABILITIES)) {
values[colPosMap.get(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)) { if (colPosMap.containsKey(UIProvider.AccountColumns.FOLDER_LIST_URI)) {
values[colPosMap.get(UIProvider.AccountColumns.FOLDER_LIST_URI)] = values[colPosMap.get(UIProvider.AccountColumns.FOLDER_LIST_URI)] =