diff options
| author | Martin Hibdon <mhibdon@google.com> | 2014-09-08 20:05:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-08 20:05:21 +0000 |
| commit | c845295ffb23f45f4e6f2fb633b16b6d045c483e (patch) | |
| tree | 3ef375be13baef562150f2cfad43607e5f3f6ab4 /src | |
| parent | 86e17ba199bb0419003f4d4591b9312237a56baf (diff) | |
| parent | 606213ea022c75e156249c37d4374e8ceb4d2340 (diff) | |
| download | android_packages_apps_Email-c845295ffb23f45f4e6f2fb633b16b6d045c483e.tar.gz android_packages_apps_Email-c845295ffb23f45f4e6f2fb633b16b6d045c483e.tar.bz2 android_packages_apps_Email-c845295ffb23f45f4e6f2fb633b16b6d045c483e.zip | |
Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/email/activity/setup/AccountSetupIncomingFragment.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java index 7ae2c38e8..b403fbf26 100644 --- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java +++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java @@ -256,6 +256,17 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment configureEditor(); loadSettings(); + + final List<VendorPolicyLoader.OAuthProvider> oauthProviders = + AccountSettingsUtils.getAllOAuthProviders(getActivity()); + final boolean offerOAuth = (mServiceInfo.offerOAuth && oauthProviders.size() > 0); + if (mAuthenticationLabel != null) { + if (offerOAuth) { + mAuthenticationLabel.setText(R.string.authentication_label); + } else { + mAuthenticationLabel.setText(R.string.account_setup_basics_password_label); + } + } } /** @@ -342,16 +353,9 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment mServiceInfo = mSetupData.getIncomingServiceInfo(getActivity()); final List<VendorPolicyLoader.OAuthProvider> oauthProviders = AccountSettingsUtils.getAllOAuthProviders(getActivity()); - final boolean offerOAuth = (mServiceInfo.offerOAuth && oauthProviders.size() > 0); + final boolean offerOAuth = (mServiceInfo.offerOAuth && oauthProviders.size() > 0); mAuthenticationView.setAuthInfo(offerOAuth, recvAuth); - if (mAuthenticationLabel != null) { - if (offerOAuth) { - mAuthenticationLabel.setText(R.string.authentication_label); - } else { - mAuthenticationLabel.setText(R.string.account_setup_basics_password_label); - } - } final String username = recvAuth.mLogin; if (username != null) { |