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

am: d40ea0a963 Change-Id: Ie2b6385a47b7f6064e453ae09a5155d0ed16329f
2017-03-29 02:24:27 +00:00
parent 6c4d4600e3 d40ea0a963
commit 530c6dbbd8
1 changed files with 0 additions and 2 deletions
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -134,14 +134,12 @@ public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListene

        switch (state) {
            case WifiManager.WIFI_STATE_ENABLING:
-                mSwitchWidget.setEnabled(false);
                break;
            case WifiManager.WIFI_STATE_ENABLED:
                setSwitchBarChecked(true);
                mSwitchWidget.setEnabled(true);
                break;
            case WifiManager.WIFI_STATE_DISABLING:
-                mSwitchWidget.setEnabled(false);
                break;
            case WifiManager.WIFI_STATE_DISABLED:
                setSwitchBarChecked(false);