From 6f3a98bb00f12851682c28d265be4f66fad85fd6 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Tue, 28 Dec 2010 16:11:12 -0800 Subject: 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 --- src/com/android/settings/WirelessSettings.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/com/android/settings/WirelessSettings.java') 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 -- cgit v1.2.3