Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev

This commit is contained in:
TreeHugger Robot
2017-03-29 02:20:09 +00:00
committed by Android (Google) Code Review

View File

@@ -134,14 +134,12 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene
switch (state) { switch (state) {
case WifiManager.WIFI_STATE_ENABLING: case WifiManager.WIFI_STATE_ENABLING:
mSwitchWidget.setEnabled(false);
break; break;
case WifiManager.WIFI_STATE_ENABLED: case WifiManager.WIFI_STATE_ENABLED:
setSwitchBarChecked(true); setSwitchBarChecked(true);
mSwitchWidget.setEnabled(true); mSwitchWidget.setEnabled(true);
break; break;
case WifiManager.WIFI_STATE_DISABLING: case WifiManager.WIFI_STATE_DISABLING:
mSwitchWidget.setEnabled(false);
break; break;
case WifiManager.WIFI_STATE_DISABLED: case WifiManager.WIFI_STATE_DISABLED:
setSwitchBarChecked(false); setSwitchBarChecked(false);