am 5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev
* commit '5cf30c608f21a9685310e6cf7d5970c8b7fb36c8':
Pass wifi ap state through to tile when receiver triggered.
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
index f28a24b..ddde106 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -94,7 +94,11 @@
state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed();
state.label = mContext.getString(R.string.quick_settings_hotspot_label);
- state.value = mController.isHotspotEnabled();
+ if (arg instanceof Boolean) {
+ state.value = (boolean) arg;
+ } else {
+ mController.isHotspotEnabled();
+ }
state.icon = state.visible && state.value ? mEnable : mDisable;
}
@@ -120,7 +124,7 @@
private final class Callback implements HotspotController.Callback {
@Override
public void onHotspotChanged(boolean enabled) {
- refreshState();
+ refreshState(enabled);
}
};
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
index 4bfd528..1e3bc4d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
@@ -111,7 +111,9 @@
@Override
public void onReceive(Context context, Intent intent) {
if (DEBUG) Log.d(TAG, "onReceive " + intent.getAction());
- fireCallback(isHotspotEnabled());
+ int state = intent.getIntExtra(
+ WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);
+ fireCallback(WifiManager.WIFI_AP_STATE_ENABLED == state);
}
}
}