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

Commit 05075242 authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

Enable UI for EAP-SIM/AKA/AKA' 

We hide identity field for these; since dynamic
identities are now supported.

Change-Id: I5c6816b005ffbcdfa9aad953f5167d3dfd9de055
parent 279cb4a5

res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -316,6 +316,12 @@ 
        <item>TTLS</item>

        <!-- Do not translate. -->

        <item>PWD</item>

        <!-- Do not translate. -->

        <item>SIM</item>

        <!-- Do not translate. -->

        <item>AKA</item>

        <!-- Do not translate. -->

        <item>AKA\'</item>

    </string-array>



   <!-- Wi-Fi WPS setup for p2p connections.  -->

src/com/android/settings/wifi/WifiConfigController.java

+17 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ public class WifiConfigController implements TextWatcher, 
    public static final int WIFI_EAP_METHOD_TLS  = 1;

    public static final int WIFI_EAP_METHOD_TTLS = 2;

    public static final int WIFI_EAP_METHOD_PWD  = 3;

    public static final int WIFI_EAP_METHOD_SIM  = 4;

    public static final int WIFI_EAP_METHOD_AKA  = 5;

    public static final int WIFI_EAP_METHOD_AKA_PRIME  = 6;



    /* These values come from "wifi_peap_phase2_entries" resource array */

    public static final int WIFI_PEAP_PHASE2_NONE 	    = 0;
@@ -762,7 +765,21 @@ public class WifiConfigController implements TextWatcher, 
                mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);

                setUserCertInvisible();

                break;

            case WIFI_EAP_METHOD_SIM:

            case WIFI_EAP_METHOD_AKA:

            case WIFI_EAP_METHOD_AKA_PRIME:

                setPhase2Invisible();

                setAnonymousIdentInvisible();

                setUserCertInvisible();

                setPasswordInvisible();

                setIdentityInvisible();

                break;

        }

    }



    private void setIdentityInvisible() {

        mView.findViewById(R.id.l_identity).setVisibility(View.GONE);

        mPhase2Spinner.setSelection(Phase2.NONE);

    }



    private void setPhase2Invisible() {