diff options
| author | Tony Mantler <nicoya@google.com> | 2014-06-27 17:52:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-27 15:56:14 +0000 |
| commit | 88580cd5e04bd21a5a87ad4702a728ebbb57618c (patch) | |
| tree | 3a73511d8e3d8ff0d0067504db941421b8ae51b1 /tests | |
| parent | 9a311806cab6e70c960a26a0207d44a6c01ccac9 (diff) | |
| parent | 06415a635f5f01d8e1620b29f44d68dc4dfdf435 (diff) | |
| download | android_packages_apps_Email-88580cd5e04bd21a5a87ad4702a728ebbb57618c.tar.gz android_packages_apps_Email-88580cd5e04bd21a5a87ad4702a728ebbb57618c.tar.bz2 android_packages_apps_Email-88580cd5e04bd21a5a87ad4702a728ebbb57618c.zip | |
Merge "Unify settings activity" into ub-mail-master
Diffstat (limited to 'tests')
4 files changed, 12 insertions, 6 deletions
diff --git a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java b/tests/src/com/android/email/activity/setup/AccountSettingsTests.java index 91115237f..eb6265421 100644 --- a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java +++ b/tests/src/com/android/email/activity/setup/AccountSettingsTests.java @@ -128,9 +128,9 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou runTestOnUiThread(new Runnable() { public void run() { - AccountSettingsFragment f = theActivity.getSettingsFragment(); - mCheckFrequency = - (ListPreference) f.findPreference(PREFERENCE_FREQUENCY); + //AccountSettingsFragment f = theActivity.getSettingsFragment(); + //mCheckFrequency = + // (ListPreference) f.findPreference(PREFERENCE_FREQUENCY); } }); } diff --git a/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java index 46b001652..bac1e68de 100644 --- a/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java +++ b/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java @@ -197,7 +197,9 @@ public class AccountSetupIncomingTests extends final HostAuth auth = account.getOrCreateHostAuthRecv(context); auth.setHostAuthFromString(storeUriString); final SetupDataFragment setupDataFragment = - new SetupDataFragment(SetupDataFragment.FLOW_MODE_NORMAL, account); + new SetupDataFragment(); + setupDataFragment.setFlowMode(SetupDataFragment.FLOW_MODE_NORMAL); + setupDataFragment.setAccount(account); final Intent i = new Intent(AccountSetupFinal.ACTION_JUMP_TO_INCOMING); i.putExtra(SetupDataFragment.EXTRA_SETUP_DATA, setupDataFragment); return i; diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java index ac3349278..f1f9ae043 100644 --- a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java +++ b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java @@ -172,7 +172,9 @@ public class AccountSetupOptionsTests final HostAuth auth = account.getOrCreateHostAuthRecv(context); auth.setHostAuthFromString(storeUri); final SetupDataFragment setupDataFragment = - new SetupDataFragment(SetupDataFragment.FLOW_MODE_NORMAL, account); + new SetupDataFragment(); + setupDataFragment.setFlowMode(SetupDataFragment.FLOW_MODE_NORMAL); + setupDataFragment.setAccount(account); final Intent i = new Intent(AccountSetupFinal.ACTION_JUMP_TO_OPTIONS); i.putExtra(SetupDataFragment.EXTRA_SETUP_DATA, setupDataFragment); return i; diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java index 770a3ead2..5cb6a949c 100644 --- a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java +++ b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java @@ -202,7 +202,9 @@ public class AccountSetupOutgoingTests extends final HostAuth auth = account.getOrCreateHostAuthSend(context); auth.setHostAuthFromString(senderUriString); final SetupDataFragment setupDataFragment = - new SetupDataFragment(SetupDataFragment.FLOW_MODE_NORMAL, account); + new SetupDataFragment(); + setupDataFragment.setFlowMode(SetupDataFragment.FLOW_MODE_NORMAL); + setupDataFragment.setAccount(account); final Intent i = new Intent(AccountSetupFinal.ACTION_JUMP_TO_OUTGOING); i.putExtra(SetupDataFragment.EXTRA_SETUP_DATA, setupDataFragment); return i; |