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

am: ace9f52725

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

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

View File

@@ -279,7 +279,7 @@ public class WifiConfigController implements TextWatcher,
final DetailedState state = mAccessPoint.getDetailedState();
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));
} else {
if (state != null) {