From 9a44073e75027b191dec209ade0ae4988e48b4ca Mon Sep 17 00:00:00 2001
From: Tony Mantler <nicoya@google.com>
Date: Thu, 15 May 2014 13:55:03 -0700
Subject: [PATCH] Fix the remainder of save-alert cases

b/14969455

Change-Id: I19b138b7d5b30a4f617a1af9a5be878c03068327
(cherry picked from commit 28dd431c2377655775a1f07e4365776ccc1b03a7)
---
 .../email/activity/setup/AccountServerBaseFragment.java        | 1 +
 src/com/android/email/activity/setup/AccountSettings.java      | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/email/activity/setup/AccountServerBaseFragment.java b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
index 8fe66b0b4..71fe9af71 100644
--- a/src/com/android/email/activity/setup/AccountServerBaseFragment.java
+++ b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
@@ -246,6 +246,7 @@ public abstract class AccountServerBaseFragment extends AccountSetupFragment
      * Returns whether or not any settings have changed.
      */
     public boolean haveSettingsChanged() {
+        collectUserInputInternal();
         final Account account = mSetupData.getAccount();
 
         final HostAuth sendAuth = account.getOrCreateHostAuthSend(mAppContext);
diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 0a78476a8..512f87564 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -41,7 +41,6 @@ import android.view.MenuItem;
 import android.widget.TextView;
 
 import com.android.email.R;
-import com.android.email.activity.setup.CheckSettingsProgressDialogFragment;
 import com.android.email.provider.EmailProvider;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.Account;
@@ -665,7 +664,7 @@ public class AccountSettings extends PreferenceActivity implements
      */
     @Override
     public void onAccountServerSaveComplete() {
-        onBackPressed();
+        super.onBackPressed();
     }
 
     @Override