am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev

* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
This commit is contained in:
Jeff Davidson
2014-12-08 19:36:46 +00:00
committed by Android Git Automerger

View File

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