PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create MeteredPreference with correct preference context."

Browse Source
This commit is contained in:
Fan Zhang
2017-01-10 17:12:23 +00:00
committed by Android (Google) Code Review
parent a3af5a5c28 da2d426d49
commit 4185b2fef3
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/data_usage_metered_prefs.xml
View File

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

6
src/com/android/settings/datausage/DataUsageMeteredSettings.java
View File

@@ -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;
}