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

Commit b331c393 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

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

parents ecac0e55 b212629d

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1531,6 +1531,10 @@ 
    <string name="wifi_ip_address">IP address</string>

    <!-- Hint text for the IP address -->

    <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 -->

    <string name="wifi_eap_method">EAP method</string>

    <!-- Label for the phase2 -->

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

+4 −0
Original line number Diff line number Diff line
@@ -224,6 +224,10 @@ public class WifiConfigController implements TextWatcher, 
                } else {

                    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())