PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hotspot 2.0 UI for saved network." into mnc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2015-05-14 02:40:36 +00:00
committed by Android (Google) Code Review
parent ecac0e5590 b212629d92
commit b331c3937d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1531,6 +1531,10 @@
<string name="wifi_ip_address">IP address</string> <string name="wifi_ip_address">IP address</string>
<!-- Hint text for the IP address --> <!-- Hint text for the IP address -->
<string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string> <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 --> <!-- Label for the EAP method of the network -->
<string name="wifi_eap_method">EAP method</string> <string name="wifi_eap_method">EAP method</string>
<!-- Label for the phase2 --> <!-- Label for the phase2 -->

4
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -224,6 +224,10 @@ public class WifiConfigController implements TextWatcher,
} else { } else {
mProxySettingsSpinner.setSelection(PROXY_NONE); 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()) if ((!mAccessPoint.isSaved() && !mAccessPoint.isActive())