Merge "Display connect button in the wifi connection menu" am: 9126cfba19 am: ace9f52725 am: aa5afb18fe

am: 38e93b85f0

* commit '38e93b85f0d3d5dff06034d0e3616015b73f50dc':
  Display connect button in the wifi connection menu

Change-Id: Id7025428de1e16e481bfbca8fa61004df36f34dc
This commit is contained in:
Paul Stewart
2016-05-27 15:32:37 +00:00
committed by android-build-merger

View File

@@ -279,7 +279,7 @@ public class WifiConfigController implements TextWatcher,
final DetailedState state = mAccessPoint.getDetailedState(); final DetailedState state = mAccessPoint.getDetailedState();
final String signalLevel = getSignalString(); final String signalLevel = getSignalString();
if (state == null && signalLevel != null) { if ((state == null || state == DetailedState.DISCONNECTED) && signalLevel != null) {
mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect)); mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
} else { } else {
if (state != null) { if (state != null) {