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

Merge "End of Life screen for Email" into ub-gmail-ur14-dev

This commit is contained in:
James Lemieux 2014-08-14 20:57:18 +00:00 committed by Android (Google) Code Review
parent 7941b406cf 50591a7be4
commit 66ff95a561
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/constants.xml
View File

@ -30,4 +30,10 @@
<!-- Boolean value indicating whether we should show the OAuth option on initial account setup
(not settings) -->
<bool name="skip_oauth_on_setup">false</bool>
<!-- the email application reconciles accounts on startup with the account manager -->
<bool name="reconcile_accounts">true</bool>
<!-- the email application starts services -->
<bool name="enable_services">true</bool>
</resources>

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

@ -104,7 +104,6 @@ import com.android.emailcommon.service.IEmailService;
import com.android.emailcommon.service.SearchParams;
import com.android.emailcommon.utility.AttachmentUtilities;
import com.android.emailcommon.utility.EmailAsyncTask;
import com.android.emailcommon.utility.IntentUtilities;
import com.android.emailcommon.utility.Utility;
import com.android.ex.photo.provider.PhotoContract;
import com.android.mail.preferences.MailPrefs;
@ -378,12 +377,14 @@ public class EmailProvider extends ContentProvider
private final Set<SyncRequestMessage> mDelayedSyncRequests = new HashSet<SyncRequestMessage>();
private static void reconcileAccountsAsync(final Context context) {
EmailAsyncTask.runAsyncParallel(new Runnable() {
@Override
public void run() {
AccountReconciler.reconcileAccounts(context);
}
});
if (context.getResources().getBoolean(R.bool.reconcile_accounts)) {
EmailAsyncTask.runAsyncParallel(new Runnable() {
@Override
public void run() {
AccountReconciler.reconcileAccounts(context);
}
});
}
}
public static Uri uiUri(String type, long id) {

15
src/com/android/email2/ui/MailActivityEmail.java
View File

@ -28,6 +28,7 @@ import android.os.Bundle;
import com.android.email.NotificationController;
import com.android.email.Preferences;
import com.android.email.R;
import com.android.email.provider.EmailProvider;
import com.android.email.service.AttachmentService;
import com.android.email.service.EmailServiceUtils;
@ -84,12 +85,14 @@ public class MailActivityEmail extends com.android.mail.ui.MailActivity {
* UI thread (or lifecycle entry points.)
*/
public static void setServicesEnabledAsync(final Context context) {
EmailAsyncTask.runAsyncParallel(new Runnable() {
@Override
public void run() {
setServicesEnabledSync(context);
}
});
if (context.getResources().getBoolean(R.bool.enable_services)) {
EmailAsyncTask.runAsyncParallel(new Runnable() {
@Override
public void run() {
setServicesEnabledSync(context);
}
});
}
}
/**