commit 699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7
author Jeff Davidson <jpd@google.com> Sat Dec 06 02:06:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 06 02:07:00 2014 +0000
tree 67f5c593e409148acbb3e78ebe09028a6c8e305a
parent f779e6b8ac827d923e3e7905045ad5c35512c535
parent 7585c56fc84927f30857134714b13f182339d8c1

Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

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 @@
                     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;
                 }