summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-08-25 07:57:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-25 07:57:06 -0700
commita81fe3bbcc49a783ff99aea5e09e15191b065017 (patch)
tree725d492e096e8961e844dcd31dd6373cb2861efc /packages
parent07800a50399d73df322b823a079de29378b3c112 (diff)
parent7b2013d94c29da01dba298c6ab97b7b2b37fad34 (diff)
downloadframeworks_base-a81fe3bbcc49a783ff99aea5e09e15191b065017.zip
frameworks_base-a81fe3bbcc49a783ff99aea5e09e15191b065017.tar.gz
frameworks_base-a81fe3bbcc49a783ff99aea5e09e15191b065017.tar.bz2
Merge "Only show wifi indicator when wifi is connected."
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index 16db1d7..60dfdac 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -225,7 +225,7 @@ public class NetworkController extends BroadcastReceiver {
public void addSignalCluster(SignalCluster cluster) {
mSignalClusters.add(cluster);
cluster.setWifiIndicators(
- mWifiEnabled,
+ mWifiConnected, // only show wifi in the cluster if connected
mWifiIconId,
mWifiActivityIconId);
cluster.setMobileDataIndicators(
@@ -862,7 +862,7 @@ public class NetworkController extends BroadcastReceiver {
// NB: the mLast*s will be updated later
for (SignalCluster cluster : mSignalClusters) {
cluster.setWifiIndicators(
- mWifiEnabled,
+ mWifiConnected, // only show wifi in the cluster if connected
mWifiIconId,
mWifiActivityIconId);
cluster.setMobileDataIndicators(