Merge "Return settings fragment class for account" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-06-23 22:26:00 +00:00 committed by Android (Google) Code Review
commit 5f24f6f2e5
1 changed files with 5 additions and 0 deletions

View File

@ -66,6 +66,7 @@ import com.android.common.content.ProjectionMap;
import com.android.email.Preferences;
import com.android.email.R;
import com.android.email.SecurityPolicy;
import com.android.email.activity.setup.AccountSettingsFragment;
import com.android.email.activity.setup.AccountSettingsUtils;
import com.android.email.service.AttachmentDownloadService;
import com.android.email.service.EmailServiceUtils;
@ -3545,6 +3546,10 @@ public class EmailProvider extends ContentProvider
values.put(UIProvider.AccountColumns.QUICK_RESPONSE_URI,
combinedUriString("quickresponse/account", id));
}
if (projectionColumns.contains(UIProvider.AccountColumns.SETTINGS_FRAGMENT_CLASS)) {
values.put(UIProvider.AccountColumns.SETTINGS_FRAGMENT_CLASS,
AccountSettingsFragment.class.getName());
}
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)) {
values.put(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
mailPrefs.getDefaultReplyAll()