summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-02-07 02:55:56 +0300
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-02-07 02:55:56 +0300
commit5e120f879c1c2bd01aa3425a1bea59aa44fc272d (patch)
tree962580ebb4150092ae519c4ff0d8fcfbac1b95ba /packages/SystemUI/src/com/android
parent3bbbebfa5b5e4ca3453e796a3dff902d81352ede (diff)
parente6b32ffec22e54b9a792b988c8de15b80129e675 (diff)
downloadframeworks_base-5e120f879c1c2bd01aa3425a1bea59aa44fc272d.zip
frameworks_base-5e120f879c1c2bd01aa3425a1bea59aa44fc272d.tar.gz
frameworks_base-5e120f879c1c2bd01aa3425a1bea59aa44fc272d.tar.bz2
Merge "Set the data type icon to 0 when connected to wifi" into ics
Diffstat (limited to 'packages/SystemUI/src/com/android')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java1
1 files changed, 1 insertions, 0 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 fcd57a3..7504a1b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -923,6 +923,7 @@ public class NetworkController extends BroadcastReceiver {
}
}
+ mDataTypeIconId = 0;
combinedActivityIconId = mWifiActivityIconId;
combinedSignalIconId = mWifiIconId; // set by updateWifiIcons()
mContentDescriptionCombinedSignal = mContentDescriptionWifi;