diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-05-14 02:40:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 02:40:44 +0000 |
| commit | 402be0628c3c27273e826344ec7b12d53f861152 (patch) | |
| tree | e085310cf9957d4619831cf697fe517ae08ce847 | |
| parent | 2bdd69c4a2d9a8a5e94770a710123fb1958cf25b (diff) | |
| parent | d187880109a614f677911c89cdc1cb034341de3d (diff) | |
| download | frameworks_base-402be0628c3c27273e826344ec7b12d53f861152.zip frameworks_base-402be0628c3c27273e826344ec7b12d53f861152.tar.gz frameworks_base-402be0628c3c27273e826344ec7b12d53f861152.tar.bz2 | |
Merge "Hotspot 2.0 UI." into mnc-dev
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index b702e35..377a9a4 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -48,6 +48,8 @@ <string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string> <!-- Do not translate. Concise terminology for wifi with 802.1x EAP security --> <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. --> <string name="wifi_remembered">Saved</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 1ad7a51..7049d6a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -248,6 +248,9 @@ public class AccessPoint implements Comparable<AccessPoint> { public String getSecurityString(boolean concise) { Context context = mContext; + if (mConfig != null && mConfig.isPasspoint()) { + return context.getString(R.string.wifi_security_passpoint); + } switch(security) { case SECURITY_EAP: return concise ? context.getString(R.string.wifi_security_short_eap) : |