Merge "Fix back button handling on protocol choice screen" into ub-mail-master
This commit is contained in:
commit
e93b81a51a
|
@ -30,6 +30,7 @@ import com.android.email.service.EmailServiceUtils;
|
||||||
|
|
||||||
public class AccountSetupTypeFragment extends AccountSetupFragment
|
public class AccountSetupTypeFragment extends AccountSetupFragment
|
||||||
implements View.OnClickListener {
|
implements View.OnClickListener {
|
||||||
|
private int mLastId;
|
||||||
|
|
||||||
public interface Callback extends AccountSetupFragment.Callback {
|
public interface Callback extends AccountSetupFragment.Callback {
|
||||||
/**
|
/**
|
||||||
|
@ -76,6 +77,7 @@ public class AccountSetupTypeFragment extends AccountSetupFragment
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mLastId = i - 1;
|
||||||
|
|
||||||
setNextButtonVisibility(View.INVISIBLE);
|
setNextButtonVisibility(View.INVISIBLE);
|
||||||
|
|
||||||
|
@ -84,8 +86,13 @@ public class AccountSetupTypeFragment extends AccountSetupFragment
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
final String protocol = (String) v.getTag();
|
final int viewId = v.getId();
|
||||||
final Callback callback = (Callback) getActivity();
|
if (viewId <= mLastId) {
|
||||||
callback.onChooseProtocol(protocol);
|
final String protocol = (String) v.getTag();
|
||||||
|
final Callback callback = (Callback) getActivity();
|
||||||
|
callback.onChooseProtocol(protocol);
|
||||||
|
} else {
|
||||||
|
super.onClick(v);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue