am b2fd4d25: Merge "Make AccountSettings implement callbacks for check settings dialog" into ub-mail-algol

* commit 'b2fd4d25767938bf693aba12f73f1dd0ee462427':
  Make AccountSettings implement callbacks for check settings dialog
This commit is contained in:
Tony Mantler 2014-04-18 19:03:26 +00:00 committed by Android Git Automerger
commit a5ba759443
1 changed files with 7 additions and 1 deletions

View File

@ -41,6 +41,7 @@ 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;
@ -73,7 +74,7 @@ import java.util.List;
public class AccountSettings extends PreferenceActivity implements
SetupDataFragment.SetupDataContainer, SecurityRequiredDialogFragment.Callback,
CheckSettingsErrorDialogFragment.Callback, AccountCheckSettingsFragment.Callback,
AccountServerBaseFragment.Callback {
AccountServerBaseFragment.Callback, CheckSettingsProgressDialogFragment.Callback {
/*
* Intent to open account settings for account=1
adb shell am start -a android.intent.action.EDIT \
@ -673,6 +674,11 @@ public class AccountSettings extends PreferenceActivity implements
.commit();
}
@Override
public void onCheckSettingsProgressDialogCancel() {
dismissCheckSettingsFragment();
}
/**
* After verifying a new server configuration as OK, we return here and continue. This kicks
* off the save process.