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

Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-05-03 15:13:49 -07:00
committed by Android (Google) Code Review
parent c62d321e8d 0bc5b93fe2
commit d86d44b745
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/DataUsageSummary.java
View File

@@ -278,6 +278,12 @@ public class DataUsageSummary extends Fragment {
mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false); mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false);
mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false); mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false);
// override preferences when no mobile radio
if (!hasReadyMobileRadio(context)) {
mShowWifi = hasWifiRadio(context);
mShowEthernet = hasEthernet(context);
}
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@@ -461,7 +467,6 @@ public class DataUsageSummary extends Fragment {
showWifi.setChecked(mShowWifi); showWifi.setChecked(mShowWifi);
} else { } else {
showWifi.setVisible(false); showWifi.setVisible(false);
mShowWifi = true;
} }
final MenuItem showEthernet = menu.findItem(R.id.data_usage_menu_show_ethernet); final MenuItem showEthernet = menu.findItem(R.id.data_usage_menu_show_ethernet);
@@ -470,7 +475,6 @@ public class DataUsageSummary extends Fragment {
showEthernet.setChecked(mShowEthernet); showEthernet.setChecked(mShowEthernet);
} else { } else {
showEthernet.setVisible(false); showEthernet.setVisible(false);
mShowEthernet = true;
} }
final MenuItem metered = menu.findItem(R.id.data_usage_menu_metered); final MenuItem metered = menu.findItem(R.id.data_usage_menu_metered);