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

Commit d8a18ad8 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Better messaging when Wi-Fi disabled." into jb-dev

parents 8517794f 37c222fd

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3784,6 +3784,8 @@ 
    <string name="data_usage_metered_mobile">Mobile networks</string>

    <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->

    <string name="data_usage_metered_wifi">Wi-Fi networks</string>

    <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->

    <string name="data_usage_metered_wifi_disabled">To select metered Wi-Fi networks, turn Wi-Fi on.</string>



    <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->

    <string name="cryptkeeper_emergency_call">Emergency call</string>

res/xml/data_usage_metered_prefs.xml

+9 −1
Original line number Diff line number Diff line
@@ -29,6 +29,14 @@ 
    <PreferenceCategory

        android:key="wifi"

        android:title="@string/data_usage_metered_wifi"

        android:persistent="false" />

        android:persistent="false">



        <Preference

            android:key="wifi_disabled"

            android:summary="@string/data_usage_metered_wifi_disabled"

            android:persistent="false"

            android:selectable="false" />



    </PreferenceCategory>



</PreferenceScreen>

src/com/android/settings/net/DataUsageMeteredSettings.java

+5 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { 


    private PreferenceCategory mMobileCategory;

    private PreferenceCategory mWifiCategory;

    private Preference mWifiDisabled;



    @Override

    public void onCreate(Bundle icicle) {
@@ -63,9 +64,9 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { 
        addPreferencesFromResource(R.xml.data_usage_metered_prefs);

        mMobileCategory = (PreferenceCategory) findPreference("mobile");

        mWifiCategory = (PreferenceCategory) findPreference("wifi");

        mWifiDisabled = findPreference("wifi_disabled");



        updateNetworks(context);



    }



    private void updateNetworks(Context context) {
@@ -76,15 +77,15 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { 
            getPreferenceScreen().removePreference(mMobileCategory);

        }



        if (hasWifiRadio(context)) {

        mWifiCategory.removeAll();

        if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {

            for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {

                if (config.SSID != null) {

                    mWifiCategory.addPreference(buildWifiPref(context, config));

                }

            }

        } else {

            getPreferenceScreen().removePreference(mWifiCategory);

            mWifiCategory.addPreference(mWifiDisabled);

        }

    }