From b5a44337983546877df9a0ecff019cc58e45b9d0 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Wed, 19 Mar 2014 10:09:24 -0700 Subject: [PATCH] Fix back button handling on protocol choice screen b/13543514 Change-Id: I27078220aca60ac5137fc69e34e52937313602c9 --- .../activity/setup/AccountSetupTypeFragment.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/activity/setup/AccountSetupTypeFragment.java b/src/com/android/email/activity/setup/AccountSetupTypeFragment.java index bd181ca98..47a6fcdd6 100644 --- a/src/com/android/email/activity/setup/AccountSetupTypeFragment.java +++ b/src/com/android/email/activity/setup/AccountSetupTypeFragment.java @@ -30,6 +30,7 @@ import com.android.email.service.EmailServiceUtils; public class AccountSetupTypeFragment extends AccountSetupFragment implements View.OnClickListener { + private int mLastId; public interface Callback extends AccountSetupFragment.Callback { /** @@ -76,6 +77,7 @@ public class AccountSetupTypeFragment extends AccountSetupFragment i++; } } + mLastId = i - 1; setNextButtonVisibility(View.INVISIBLE); @@ -84,8 +86,13 @@ public class AccountSetupTypeFragment extends AccountSetupFragment @Override public void onClick(View v) { - final String protocol = (String) v.getTag(); - final Callback callback = (Callback) getActivity(); - callback.onChooseProtocol(protocol); + final int viewId = v.getId(); + if (viewId <= mLastId) { + final String protocol = (String) v.getTag(); + final Callback callback = (Callback) getActivity(); + callback.onChooseProtocol(protocol); + } else { + super.onClick(v); + } } }