summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-05-26 17:01:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-26 17:01:51 +0000
commit80370952e9008ba3949d6e9bc3412e62a05e1ba3 (patch)
tree816b42ffff79f8b41692a1600e1508d31e1425a5
parent16224288791dd3f122931504e624637fdcc70903 (diff)
parent283c8b72aa6f72431d0684972782bac667e19617 (diff)
downloadframeworks_base-80370952e9008ba3949d6e9bc3412e62a05e1ba3.zip
frameworks_base-80370952e9008ba3949d6e9bc3412e62a05e1ba3.tar.gz
frameworks_base-80370952e9008ba3949d6e9bc3412e62a05e1ba3.tar.bz2
Merge "QS: Only show summary for active wifi" into mnc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java2
1 files changed, 1 insertions, 1 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 9504ea3..9bc5b75 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -326,7 +326,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
item.tag = ap;
item.icon = mWifiController.getIcon(ap);
item.line1 = ap.getSsid();
- item.line2 = ap.getSummary();
+ item.line2 = ap.isActive() ? ap.getSummary() : null;
item.overlay = ap.getSecurity() != AccessPoint.SECURITY_NONE
? mContext.getDrawable(R.drawable.qs_ic_wifi_lock)
: null;