From cf194df05c31045ec734ace84ce2b739639bf12e Mon Sep 17 00:00:00 2001 From: Jorge Lugo Date: Fri, 24 Jun 2011 11:15:38 -0700 Subject: [PATCH] Don't display warning message on edit incoming settings On phones, opening "incoming settings" no longer immediately displays the warning message associated with editing the username field. It now only displays when the username is focused by the user. Bug: 4282856 Change-Id: Ic0a74fa91a0f9cff66565372872e182a0eaec779 --- .../email/activity/setup/AccountSetupExchangeFragment.java | 4 ++++ .../email/activity/setup/AccountSetupIncomingFragment.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java index fdcc7c28a..72ae31127 100644 --- a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java +++ b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java @@ -262,6 +262,10 @@ public class AccountSetupExchangeFragment extends AccountServerBaseFragment if (hostAuth.mPassword != null) { mPasswordView.setText(hostAuth.mPassword); + // Since username is uneditable, focus on the next editable field + if (mSettingsMode) { + mPasswordView.requestFocus(); + } } String protocol = hostAuth.mProtocol; diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java index 7b37775e1..41fa6134d 100644 --- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java +++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java @@ -313,6 +313,10 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment { String password = recvAuth.mPassword; if (password != null) { mPasswordView.setText(password); + // Since username is uneditable, focus on the next editable field + if (mSettingsMode) { + mPasswordView.requestFocus(); + } } if (HostAuth.SCHEME_IMAP.equals(recvAuth.mProtocol)) {