diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-12-28 16:11:12 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2010-12-29 16:25:28 -0800 |
| commit | 6f3a98bb00f12851682c28d265be4f66fad85fd6 (patch) | |
| tree | 586f3c25c3d09edb4561750462d7117a5831b0e9 /src/com/android/settings/WirelessSettings.java | |
| parent | 762d2646582c073152a8774c1c6c49e1dc441d2e (diff) | |
| download | packages_apps_Settings-6f3a98bb00f12851682c28d265be4f66fad85fd6.tar.gz packages_apps_Settings-6f3a98bb00f12851682c28d265be4f66fad85fd6.tar.bz2 packages_apps_Settings-6f3a98bb00f12851682c28d265be4f66fad85fd6.zip | |
Hide http proxy UI
We don't have support in the media code so rather than confuse the users
with some apps using proxies and some not we'll just turn it off for all
for now.
bug:3283883
Change-Id: If29bb34fce04eab5adc9b5180b70dbfd718cc709
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
| -rw-r--r-- | src/com/android/settings/WirelessSettings.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index e46707d4b..bdf8ce833 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -135,6 +135,8 @@ public class WirelessSettings extends SettingsPreferenceFragment { Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS); DevicePolicyManager mDPM = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE); + // proxy UI disabled until we have better app support + getPreferenceScreen().removePreference(mGlobalProxy); mGlobalProxy.setEnabled(mDPM.getGlobalProxyAdmin() == null); // Disable Tethering if it's not allowed |