diff options
| author | Jeff Davidson <jpd@google.com> | 2014-12-06 02:06:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-06 02:07:00 +0000 |
| commit | 699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7 (patch) | |
| tree | 67f5c593e409148acbb3e78ebe09028a6c8e305a /packages/SystemUI/src/com/android/systemui/qs | |
| parent | f779e6b8ac827d923e3e7905045ad5c35512c535 (diff) | |
| parent | 7585c56fc84927f30857134714b13f182339d8c1 (diff) | |
| download | frameworks_base-699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7.zip frameworks_base-699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7.tar.gz frameworks_base-699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7.tar.bz2 | |
Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java | 4 |
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; } |