Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev

am: b991dcd1b8 Change-Id: I738bde4deee58ab84f24302048534f657698603b
2017-09-15 17:42:26 +00:00
parent b24d054e08 b991dcd1b8
commit a99dea8e66
2 changed files with 16 additions and 5 deletions
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -140,6 +140,8 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
    private void handleWifiApStateChanged(int state, int reason) {
        switch (state) {
            case WifiManager.WIFI_AP_STATE_ENABLING:
+                mPreference.setSummary(R.string.wifi_tether_starting);
+                break;
            case WifiManager.WIFI_AP_STATE_ENABLED:
                /**
                 * Summary on enable is handled by tether