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

am bed61a78: Support the "Reply all" setting

Browse Source 
* commit 'bed61a78a08f0a82c2aae12787ad64b4cd566c08':
  Support the "Reply all" setting
This commit is contained in:
Scott Kennedy 2013-05-06 20:02:49 -07:00 committed by Android Git Automerger
commit 92504a8ae6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1998,6 +1998,8 @@ public class EmailProvider extends ContentProvider {
*/
private static ProjectionMap getAccountListMap(Context context) {
if (sAccountListMap == null) {
final MailPrefs mailPrefs = MailPrefs.get(context);
final ProjectionMap.Builder builder = ProjectionMap.builder()
.add(BaseColumns._ID, AccountColumns.ID)
.add(UIProvider.AccountColumns.FOLDER_LIST_URI, uriWithId("uifolders"))
@ -2019,7 +2021,9 @@ public class EmailProvider extends ContentProvider {
.add(UIProvider.AccountColumns.SettingsColumns.SNAP_HEADERS,
Integer.toString(UIProvider.SnapHeaderValue.ALWAYS))
.add(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
Integer.toString(UIProvider.DefaultReplyBehavior.REPLY))
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))
@ -2735,6 +2739,8 @@ public class EmailProvider extends ContentProvider {
}
final Map<String, Integer> colPosMap = builder.build();
final MailPrefs mailPrefs = MailPrefs.get(getContext());
final Object[] values = new Object[columnNames.length];
if (colPosMap.containsKey(BaseColumns._ID)) {
values[colPosMap.get(BaseColumns._ID)] = 0;
@ -2792,7 +2798,9 @@ public class EmailProvider extends ContentProvider {
//.add(UIProvider.SettingsColumns.SIGNATURE, AccountColumns.SIGNATURE)
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)] =
Integer.toString(UIProvider.DefaultReplyBehavior.REPLY);
Integer.toString(mailPrefs.getDefaultReplyAll()
? UIProvider.DefaultReplyBehavior.REPLY_ALL
: UIProvider.DefaultReplyBehavior.REPLY);
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON)] =