diff options
author | Amith Yamasani <yamasani@google.com> | 2011-02-23 17:19:11 -0800 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2011-02-24 10:53:29 -0800 |
commit | 0f85c48d6c77e811f4d949503f0aa3efd908834d (patch) | |
tree | c21385cfc548e1f51301795735ab18220a2f5be0 /src/com/android/settings/WirelessSettings.java | |
parent | 2279d3e18fce7170fc48710617e2e814db5095fd (diff) | |
download | packages_apps_Settings-0f85c48d6c77e811f4d949503f0aa3efd908834d.zip packages_apps_Settings-0f85c48d6c77e811f4d949503f0aa3efd908834d.tar.gz packages_apps_Settings-0f85c48d6c77e811f4d949503f0aa3efd908834d.tar.bz2 |
Remove / re-word some settings for WiFi-only devices.
Bug: 3468248
1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"
Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
-rw-r--r-- | src/com/android/settings/WirelessSettings.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index bdf8ce8..9567c01 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -48,6 +48,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { private static final String KEY_VPN_SETTINGS = "vpn_settings"; private static final String KEY_TETHER_SETTINGS = "tether_settings"; private static final String KEY_PROXY_SETTINGS = "proxy_settings"; + private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings"; public static final String EXIT_ECM_RESULT = "exit_ecm_result"; public static final int REQUEST_CODE_EXIT_ECM = 1; @@ -131,6 +132,11 @@ public class WirelessSettings extends SettingsPreferenceFragment { getPreferenceScreen().removePreference(nfc); } + // Remove Mobile Network Settings if it's a wifi-only device. + if (Utils.isWifiOnly()) { + getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS)); + } + // Enable Proxy selector settings if allowed. Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS); DevicePolicyManager mDPM = (DevicePolicyManager) @@ -139,10 +145,10 @@ public class WirelessSettings extends SettingsPreferenceFragment { getPreferenceScreen().removePreference(mGlobalProxy); mGlobalProxy.setEnabled(mDPM.getGlobalProxyAdmin() == null); - // Disable Tethering if it's not allowed + // Disable Tethering if it's not allowed or if it's a wifi-only device ConnectivityManager cm = (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE); - if (!cm.isTetheringSupported()) { + if (!cm.isTetheringSupported() || Utils.isWifiOnly()) { getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS)); } else { String[] usbRegexs = cm.getTetherableUsbRegexs(); |