Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2015-07-14 20:23:48 +00:00
committed by Android (Google) Code Review
parent 353886b2dd b8a46a6c77
commit 5cf30c608f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
View File

@@ -94,7 +94,11 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed(); state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed();
state.label = mContext.getString(R.string.quick_settings_hotspot_label); 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; state.icon = state.visible && state.value ? mEnable : mDisable;
} }
@@ -120,7 +124,7 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
private final class Callback implements HotspotController.Callback { private final class Callback implements HotspotController.Callback {
@Override @Override
public void onHotspotChanged(boolean enabled) { public void onHotspotChanged(boolean enabled) {
refreshState(); refreshState(enabled);
} }
}; };

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
View File

@@ -111,7 +111,9 @@ public class HotspotControllerImpl implements HotspotController {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (DEBUG) Log.d(TAG, "onReceive " + intent.getAction()); 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);
} }
} }
} }