Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3c758f4 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

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

* commit '402be062':
  Hotspot 2.0 UI.
parents c2aa3557 402be062

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+3 −0
Original line number Diff line number Diff line
@@ -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) :