diff options
| author | John Spurlock <jspurlock@google.com> | 2014-05-22 12:20:16 -0400 |
|---|---|---|
| committer | Dave Langemak <dlangemak@google.com> | 2014-05-27 19:34:10 +0000 |
| commit | 3d09bbd04fc5ee028316f6cd38178c8095faa653 (patch) | |
| tree | 441f32415106da42a19b3ef0ff7d9b95f338d84d /packages | |
| parent | 8804ce96b1ef3aa260076091e77abcce0b1ea1d9 (diff) | |
| download | frameworks_base-3d09bbd04fc5ee028316f6cd38178c8095faa653.zip frameworks_base-3d09bbd04fc5ee028316f6cd38178c8095faa653.tar.gz frameworks_base-3d09bbd04fc5ee028316f6cd38178c8095faa653.tar.bz2 | |
Better wifi-enabled signal from network controller.
The old "is wifi enabled" signal was geared toward the cluster
view. Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.
Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
(cherry picked from commit fd0ea545d47b19c2ebff203a6e768a60698f3609)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index ef7fb89..a1e70b9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -83,7 +83,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { boolean wifiConnected = cb.enabled && (cb.wifiSignalIconId > 0) && (cb.enabledDesc != null); boolean wifiNotConnected = (cb.wifiSignalIconId > 0) && (cb.enabledDesc == null); - state.enabled = wifiConnected; + state.enabled = cb.enabled; state.connected = wifiConnected; state.activityIn = cb.enabled && cb.activityIn; state.activityOut = cb.enabled && cb.activityOut; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 966c0b0..56402a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -339,7 +339,7 @@ public class NetworkControllerImpl extends BroadcastReceiver boolean wifiOut = wifiEnabled && mWifiSsid != null && (mWifiActivity == WifiManager.DATA_ACTIVITY_INOUT || mWifiActivity == WifiManager.DATA_ACTIVITY_OUT); - cb.onWifiSignalChanged(wifiEnabled, mQSWifiIconId, wifiIn, wifiOut, + cb.onWifiSignalChanged(mWifiEnabled, mQSWifiIconId, wifiIn, wifiOut, mContentDescriptionWifi, wifiDesc); boolean mobileIn = mDataConnected && (mDataActivity == TelephonyManager.DATA_ACTIVITY_INOUT |