Merge "Remove attachment previews from Conversation List" into ub-mail-master

This commit is contained in:
James Lemieux 2014-07-11 19:41:27 +00:00 committed by Android (Google) Code Review
commit f79ed0f54f

View File

@ -3462,11 +3462,6 @@ public class EmailProvider extends ContentProvider
values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON, values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON,
getConversationListIcon(mailPrefs)); getConversationListIcon(mailPrefs));
} }
if (projectionColumns.contains(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS,
"0");
}
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) { if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) {
values.put(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE, values.put(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE,
Integer.toString(mailPrefs.getAutoAdvanceMode())); Integer.toString(mailPrefs.getAutoAdvanceMode()));
@ -3701,11 +3696,6 @@ public class EmailProvider extends ContentProvider
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON)] = values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON)] =
getConversationListIcon(mailPrefs); getConversationListIcon(mailPrefs);
} }
if (colPosMap.containsKey(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
values[colPosMap.get(
UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)] = 0;
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) { if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] = values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] =
mailPrefs.getConfirmDelete() ? 1 : 0; mailPrefs.getConfirmDelete() ? 1 : 0;