summaryrefslogtreecommitdiffstats
path: root/src/com/android/email/service
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-02-13 13:12:06 -0800
committerTony Mantler <nicoya@google.com>2014-02-26 13:47:41 -0800
commit76472ae40cd55d17edb0420e8fc2a7bae60c50de (patch)
treeb961ee5a06f88a9ba6989cef7cfa61938d6673a4 /src/com/android/email/service
parentda2582c9f44a4af7507a32298eb3b310abea3743 (diff)
downloadandroid_packages_apps_Email-76472ae40cd55d17edb0420e8fc2a7bae60c50de.tar.gz
android_packages_apps_Email-76472ae40cd55d17edb0420e8fc2a7bae60c50de.tar.bz2
android_packages_apps_Email-76472ae40cd55d17edb0420e8fc2a7bae60c50de.zip
Merge setup fragments under a single activity
Change-Id: I10cf8bb9f6bc1a26ea97ae664f0196ae9e9493b5
Diffstat (limited to 'src/com/android/email/service')
-rw-r--r--src/com/android/email/service/AuthenticatorService.java4
-rw-r--r--src/com/android/email/service/EasTestAuthenticatorService.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/email/service/AuthenticatorService.java b/src/com/android/email/service/AuthenticatorService.java
index 2c93c4ba1..36f3222a0 100644
--- a/src/com/android/email/service/AuthenticatorService.java
+++ b/src/com/android/email/service/AuthenticatorService.java
@@ -16,7 +16,7 @@
package com.android.email.service;
-import com.android.email.activity.setup.AccountSetupBasics;
+import com.android.email.activity.setup.AccountSetupFinal;
import com.android.emailcommon.provider.EmailContent;
import android.accounts.AbstractAccountAuthenticator;
@@ -103,7 +103,7 @@ public class AuthenticatorService extends Service {
} else {
Bundle b = new Bundle();
Intent intent =
- AccountSetupBasics.actionGetCreateAccountIntent(AuthenticatorService.this,
+ AccountSetupFinal.actionGetCreateAccountIntent(AuthenticatorService.this,
accountType);
intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
b.putParcelable(AccountManager.KEY_INTENT, intent);
diff --git a/src/com/android/email/service/EasTestAuthenticatorService.java b/src/com/android/email/service/EasTestAuthenticatorService.java
index cdb213fac..c8d853b93 100644
--- a/src/com/android/email/service/EasTestAuthenticatorService.java
+++ b/src/com/android/email/service/EasTestAuthenticatorService.java
@@ -27,7 +27,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.IBinder;
-import com.android.email.activity.setup.AccountSetupBasics;
+import com.android.email.activity.setup.AccountSetupFinal;
/**
* Anauthenticator service for reconciliation tests; it simply adds the account to AccountManager
@@ -67,7 +67,7 @@ public class EasTestAuthenticatorService extends Service {
} else {
Bundle b = new Bundle();
Intent intent =
- AccountSetupBasics.actionGetCreateAccountIntent(
+ AccountSetupFinal.actionGetCreateAccountIntent(
EasTestAuthenticatorService.this, accountType);
intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);
b.putParcelable(AccountManager.KEY_INTENT, intent);