ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev

Browse Source
This commit is contained in:
Martin Hibdon 2014-09-08 20:05:21 +00:00 committed by Android (Google) Code Review
commit c845295ffb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
View File

@ -256,6 +256,17 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment
configureEditor(); configureEditor();
loadSettings(); 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()); mServiceInfo = mSetupData.getIncomingServiceInfo(getActivity());
final List<VendorPolicyLoader.OAuthProvider> oauthProviders = final List<VendorPolicyLoader.OAuthProvider> oauthProviders =
AccountSettingsUtils.getAllOAuthProviders(getActivity()); AccountSettingsUtils.getAllOAuthProviders(getActivity());
final boolean offerOAuth = (mServiceInfo.offerOAuth && oauthProviders.size() > 0);
final boolean offerOAuth = (mServiceInfo.offerOAuth && oauthProviders.size() > 0);
mAuthenticationView.setAuthInfo(offerOAuth, recvAuth); 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; final String username = recvAuth.mLogin;
if (username != null) { if (username != null) {