Merge "Show saved networks in QS sub-panel."

This commit is contained in:
Jason Monk
2015-01-05 19:56:50 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 1 deletions

View File

@@ -630,6 +630,8 @@
<string name="quick_settings_connected">Connected</string>
<!-- QuickSettings: Control panel: Label for a connected Wi-Fi access point when the connection is established by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
<string name="quick_settings_connected_via_wfa">Connected via Wi\u2011Fi assistant</string>
<!-- QuickSettings: Control panel: Label for saved device or connection. [CHAR LIMIT=NONE] -->
<string name="quick_settings_saved">Saved</string>
<!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
<string name="quick_settings_connecting">Connecting...</string>
<!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->

View File

@@ -327,7 +327,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
R.string.quick_settings_connected :
R.string.quick_settings_connected_via_wfa);
} else if (ap.networkId >= 0) {
// TODO: Set line 2 to wifi saved string here.
item.line2 = mContext.getString(R.string.quick_settings_saved);
}
item.overlay = ap.hasSecurity
? mContext.getDrawable(R.drawable.qs_ic_wifi_lock)