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

Commit 4185b2fe authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Create MeteredPreference with correct preference context."

parents a3af5a5c da2d426d

res/xml/data_usage_metered_prefs.xml

+2 −3
Original line number Diff line number Diff line
@@ -35,9 +35,8 @@ 


    </PreferenceCategory>



    <Preference

        android:summary="@string/data_usage_metered_body"

        android:persistent="false"

    <com.android.settings.widget.FooterPreference

        android:title="@string/data_usage_metered_body"

        android:selectable="false" />



</PreferenceScreen>

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

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme 
        if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {

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

                if (config.SSID != null) {

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

                    mWifiCategory.addPreference(buildWifiPref(config));

                }

            }

        } else {
@@ -113,10 +113,10 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme 
        return pref;

    }



    private Preference buildWifiPref(Context context, WifiConfiguration config) {

    private Preference buildWifiPref(WifiConfiguration config) {

        final String networkId = config.SSID;

        final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);

        final MeteredPreference pref = new MeteredPreference(context, template);

        final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);

        pref.setTitle(removeDoubleQuotes(networkId));

        return pref;

    }