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

Create MeteredPreference with correct preference context.

Browse Source 
Bug: 33775510
Test: visual
Change-Id: I201e685f70379e48053ee910113d5ce75fddc16e
This commit is contained in:
Fan Zhang
2017-01-09 16:58:41 -08:00
parent c4372f1a48
commit da2d426d49
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> </PreferenceCategory>
<Preference <com.android.settings.widget.FooterPreference
android:summary="@string/data_usage_metered_body" android:title="@string/data_usage_metered_body"
android:persistent="false"
android:selectable="false" /> android:selectable="false" />
</PreferenceScreen> </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()) { if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) { for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
if (config.SSID != null) { if (config.SSID != null) {
mWifiCategory.addPreference(buildWifiPref(context, config)); mWifiCategory.addPreference(buildWifiPref(config));
} }
} }
} else { } else {
@@ -113,10 +113,10 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
return pref; return pref;
} }
private Preference buildWifiPref(Context context, WifiConfiguration config) { private Preference buildWifiPref(WifiConfiguration config) {
final String networkId = config.SSID; final String networkId = config.SSID;
final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId); final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
final MeteredPreference pref = new MeteredPreference(context, template); final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
pref.setTitle(removeDoubleQuotes(networkId)); pref.setTitle(removeDoubleQuotes(networkId));
return pref; return pref;
} }