Hotspot 2.0 UI for saved network.
Bug: 20182930
Change-Id: I455773f446dad323ed9cb559c2f2d69ca53af46c
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7aee58a..f14a9dc8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1531,6 +1531,10 @@
<string name="wifi_ip_address">IP address</string>
<!-- Hint text for the IP address -->
<string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
+ <!-- Label for Passpoint network -->
+ <string name="passpoint_label">Saved via</string>
+ <!-- Content for Passpoint network -->
+ <string name="passpoint_content"><xliff:g id="name">%1$s</xliff:g> credentials</string>
<!-- Label for the EAP method of the network -->
<string name="wifi_eap_method">EAP method</string>
<!-- Label for the phase2 -->
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8988495..916af01 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -224,6 +224,10 @@
} else {
mProxySettingsSpinner.setSelection(PROXY_NONE);
}
+ if (config != null && config.isPasspoint()) {
+ addRow(group, R.string.passpoint_label, String.format(
+ mContext.getString(R.string.passpoint_content), config.providerFriendlyName));
+ }
}
if ((!mAccessPoint.isSaved() && !mAccessPoint.isActive())