Merge "[Settings] Remove dependency from SUW nav bar"

This commit is contained in:
Maurice Lam
2015-09-29 17:02:43 +00:00
committed by Android (Google) Code Review
3 changed files with 1 additions and 5 deletions

View File

@@ -129,7 +129,7 @@ public class WifiSetupActivity extends WifiPickerActivity
// can either connect to a different network or press "next" to proceed.
mUserSelectedNetwork = false;
}
setNextButtonText(R.string.setup_wizard_next_button_label);
setNextButtonText(R.string.suw_next_button_label);
setNextButtonEnabled(true);
} else if (mIsWifiRequired || (mIsNetworkRequired && !isNetworkConnected())) {
// We do not want the user to skip wifi setting if