Merge "Create MeteredPreference with correct preference context."
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index 5915101..a1f3110 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -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>
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index 94a44f8..1982887 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -96,7 +96,7 @@
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 @@
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;
}