Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '699faa1d8c4ce55bf664ce122ff3fd80acd6b2f7':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
This commit is contained in:
Jeff Davidson
2014-12-06 02:10:54 +00:00
committed by Android Git Automerger
parent 386effc7a1 699faa1d8c
commit 5b8c5dd41e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
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;
}