ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Reply-all setting is modified at runtime, don't cache it in a static map" into jb-ub-mail-ur10

This commit is contained in:
Tony Mantler 2013-10-04 21:21:26 +00:00 committed by Android (Google) Code Review
parent 7c24f48a37 b424ffa65b
commit d946f8319a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/email/provider/EmailProvider.java
View File

@ -2308,10 +2308,6 @@ public class EmailProvider extends ContentProvider {
AccountColumns.SIGNATURE)
.add(UIProvider.AccountColumns.SettingsColumns.SNAP_HEADERS,
Integer.toString(UIProvider.SnapHeaderValue.ALWAYS))
.add(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
Integer.toString(mailPrefs.getDefaultReplyAll()
? UIProvider.DefaultReplyBehavior.REPLY_ALL
: UIProvider.DefaultReplyBehavior.REPLY))
.add(UIProvider.AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, "0")
.add(UIProvider.AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE,
Integer.toString(UIProvider.ConversationViewMode.UNDEFINED))
@ -2998,6 +2994,12 @@ public class EmailProvider extends ContentProvider {
values.put(UIProvider.AccountColumns.QUICK_RESPONSE_URI,
combinedUriString("quickresponse/account", id));
}
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)) {
values.put(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
mailPrefs.getDefaultReplyAll()
? UIProvider.DefaultReplyBehavior.REPLY_ALL
: UIProvider.DefaultReplyBehavior.REPLY);
}
final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values);
sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");