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

am b3c758f4: am 402be062: Merge "Hotspot 2.0 UI." into mnc-dev

Browse Source 
* commit 'b3c758f40e169f9185dd888c6cfe1f30d7437068':
  Hotspot 2.0 UI.
This commit is contained in:
Sanket Padawe
2015-05-14 06:38:13 +00:00
committed by Android Git Automerger
parent cbd1596d85 b3c758f40e
commit 772e2f5f76
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/res/values/strings.xml
View File

@@ -48,6 +48,8 @@
<string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string> <string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string>
<!-- Do not translate. Concise terminology for wifi with 802.1x EAP security --> <!-- Do not translate. Concise terminology for wifi with 802.1x EAP security -->
<string name="wifi_security_eap">802.1x EAP</string> <string name="wifi_security_eap">802.1x EAP</string>
<!-- Do not translate. Concise terminology for Passpoint network -->
<string name="wifi_security_passpoint">Passpoint</string>
<!-- Summary for the remembered network. --> <!-- Summary for the remembered network. -->
<string name="wifi_remembered">Saved</string> <string name="wifi_remembered">Saved</string>

3
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -248,6 +248,9 @@ public class AccessPoint implements Comparable<AccessPoint> {
public String getSecurityString(boolean concise) { public String getSecurityString(boolean concise) {
Context context = mContext; Context context = mContext;
if (mConfig != null && mConfig.isPasspoint()) {
return context.getString(R.string.wifi_security_passpoint);
}
switch(security) { switch(security) {
case SECURITY_EAP: case SECURITY_EAP:
return concise ? context.getString(R.string.wifi_security_short_eap) : return concise ? context.getString(R.string.wifi_security_short_eap) :