Merge "Only show wifi indicator when wifi is connected."

This commit is contained in:
Daniel Sandler
2011-08-25 07:57:06 -07:00
committed by Android (Google) Code Review

View File

@@ -225,7 +225,7 @@ public class NetworkController extends BroadcastReceiver {
public void addSignalCluster(SignalCluster cluster) { public void addSignalCluster(SignalCluster cluster) {
mSignalClusters.add(cluster); mSignalClusters.add(cluster);
cluster.setWifiIndicators( cluster.setWifiIndicators(
mWifiEnabled, mWifiConnected, // only show wifi in the cluster if connected
mWifiIconId, mWifiIconId,
mWifiActivityIconId); mWifiActivityIconId);
cluster.setMobileDataIndicators( cluster.setMobileDataIndicators(
@@ -862,7 +862,7 @@ public class NetworkController extends BroadcastReceiver {
// NB: the mLast*s will be updated later // NB: the mLast*s will be updated later
for (SignalCluster cluster : mSignalClusters) { for (SignalCluster cluster : mSignalClusters) {
cluster.setWifiIndicators( cluster.setWifiIndicators(
mWifiEnabled, mWifiConnected, // only show wifi in the cluster if connected
mWifiIconId, mWifiIconId,
mWifiActivityIconId); mWifiActivityIconId);
cluster.setMobileDataIndicators( cluster.setMobileDataIndicators(