diff options
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java index da3872e..95d5912 100644 --- a/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/MobileDataPage.java @@ -142,7 +142,7 @@ public class MobileDataPage extends SetupPage { boolean checked = !mEnableMobileData.isChecked(); SetupWizardUtils.setMobileDataEnabled(getActivity(), checked); mEnableMobileData.setChecked(checked); - if (checked) { + if (checked && !SetupWizardUtils.isWifiConnected(mContext)) { waitForData(); } else { onDataStateReady(); @@ -205,10 +205,14 @@ public class MobileDataPage extends SetupPage { if (mTitleView != null) { mTitleView.setText(mPage.getTitleResId()); } - mProgressBar.setVisibility(View.INVISIBLE); - mPageView.setVisibility(View.VISIBLE); - mPageView.startAnimation( - AnimationUtils.loadAnimation(getActivity(), R.anim.translucent_enter)); + // Something else, like data enablement, may have grabbed + // the "hold" status. Kill it only if "Next" is active + if (mNextButton.isEnabled()) { + mProgressBar.setVisibility(View.INVISIBLE); + mPageView.setVisibility(View.VISIBLE); + mPageView.startAnimation( + AnimationUtils.loadAnimation(getActivity(), R.anim.translucent_enter)); + } } } @@ -225,7 +229,8 @@ public class MobileDataPage extends SetupPage { private void onDataStateReady() { mHandler.removeCallbacks(mDataConnectionReadyRunnable); - if (getUserVisibleHint() && mProgressBar.isShown()) { + if ((getUserVisibleHint() && mProgressBar.isShown()) || + !mNextButton.isEnabled()) { mProgressBar.startAnimation( AnimationUtils.loadAnimation(getActivity(), R.anim.translucent_exit)); mProgressBar.setVisibility(View.INVISIBLE); |