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

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

Browse Source 
* commit 'd8a18ad87e930bbcd203ef65563546f13b9bbb8b':
  Better messaging when Wi-Fi disabled.
This commit is contained in:
Jeff Sharkey
2012-05-04 11:18:31 -07:00
committed by Android Git Automerger
parent edcc701d28 d8a18ad87e
commit 021452ce21
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/net/DataUsageMeteredSettings.java
View File

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