summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/qs
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2014-12-04 13:12:21 -0800
committerJeff Davidson <jpd@google.com>2014-12-04 13:17:10 -0800
commit7585c56fc84927f30857134714b13f182339d8c1 (patch)
treeed9cf19236eba7a4fe87d7e4f070fd1548f11dd4 /packages/SystemUI/src/com/android/systemui/qs
parent647b437d0772a8c73ac3936b2f8e69d4bd1953d3 (diff)
downloadframeworks_base-7585c56fc84927f30857134714b13f182339d8c1.zip
frameworks_base-7585c56fc84927f30857134714b13f182339d8c1.tar.gz
frameworks_base-7585c56fc84927f30857134714b13f182339d8c1.tar.bz2
Show "Connected via Wi-Fi assistant" for ephemeral networks.
Bug: 18525241 Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java4
1 files changed, 3 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 5e30622..699240c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -323,7 +323,9 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
item.icon = ap.iconId;
item.line1 = ap.ssid;
if (ap.isConnected) {
- item.line2 = mContext.getString(R.string.quick_settings_connected);
+ item.line2 = mContext.getString(ap.isConfigured ?
+ R.string.quick_settings_connected :
+ R.string.quick_settings_connected_via_wfa);
}
items[i] = item;
}