diff options
author | Amith Yamasani <yamasani@google.com> | 2012-09-23 12:54:14 -0700 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2012-09-23 18:43:31 -0700 |
commit | 9627a8ea151c1f27e5e9f34592c7b34fea3101c3 (patch) | |
tree | 3c92cd339e0df9ae47ac4ab92964d9b5aab36c10 /src/com/android/settings/WirelessSettings.java | |
parent | b105531116148d5d29e113e611ac180aa9691c6e (diff) | |
download | packages_apps_Settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.zip packages_apps_Settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.gz packages_apps_Settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.bz2 |
Show more settings and add restrictions/dialogs for secondary users
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
-rw-r--r-- | src/com/android/settings/WirelessSettings.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index c2a3f19..10d9214 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -26,6 +26,7 @@ import android.net.wifi.p2p.WifiP2pManager; import android.nfc.NfcAdapter; import android.os.Bundle; import android.os.SystemProperties; +import android.os.UserHandle; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceScreen; @@ -96,6 +97,8 @@ public class WirelessSettings extends SettingsPreferenceFragment { addPreferencesFromResource(R.xml.wireless_settings); + final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER; + final Activity activity = getActivity(); mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE); CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC); @@ -113,7 +116,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS); //enable/disable wimax depending on the value in config.xml - boolean isWimaxEnabled = this.getResources().getBoolean( + boolean isWimaxEnabled = !isSecondaryUser && this.getResources().getBoolean( com.android.internal.R.bool.config_wimaxEnabled); if (!isWimaxEnabled) { PreferenceScreen root = getPreferenceScreen(); @@ -130,6 +133,9 @@ public class WirelessSettings extends SettingsPreferenceFragment { if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) { findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE); } + if (isSecondaryUser) { // Disable VPN + removePreference(KEY_VPN_SETTINGS); + } // Manually set dependencies for Bluetooth when not toggleable. if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_BLUETOOTH)) { @@ -151,8 +157,8 @@ public class WirelessSettings extends SettingsPreferenceFragment { } // Remove Mobile Network Settings if it's a wifi-only device. - if (Utils.isWifiOnly(getActivity())) { - getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS)); + if (isSecondaryUser || Utils.isWifiOnly(getActivity())) { + removePreference(KEY_MOBILE_NETWORK_SETTINGS); } // Enable Proxy selector settings if allowed. @@ -166,7 +172,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { // 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 (isSecondaryUser || !cm.isTetheringSupported()) { getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS)); } else { Preference p = findPreference(KEY_TETHER_SETTINGS); @@ -187,7 +193,7 @@ public class WirelessSettings extends SettingsPreferenceFragment { } catch (IllegalArgumentException ignored) { isCellBroadcastAppLinkEnabled = false; // CMAS app not installed } - if (!isCellBroadcastAppLinkEnabled) { + if (isSecondaryUser || !isCellBroadcastAppLinkEnabled) { PreferenceScreen root = getPreferenceScreen(); Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS); if (ps != null) root.removePreference(ps); |