From 6f3a98bb00f12851682c28d265be4f66fad85fd6 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Tue, 28 Dec 2010 16:11:12 -0800 Subject: [PATCH] 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 --- res/layout/wifi_dialog.xml | 2 +- src/com/android/settings/WirelessSettings.java | 2 ++ src/com/android/settings/wifi/WifiConfigController.java | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 25ad510367a..35ca6f02726 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -271,7 +271,7 @@ style="@style/wifi_item" android:visibility="gone"> - diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index e46707d4ba1..bdf8ce8333b 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 diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 649f7de78d5..62d314e4ca6 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -166,6 +166,9 @@ public class WifiConfigController implements TextWatcher, mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings); mIpSettingsSpinner.setOnItemSelectedListener(this); mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings); + // disable proxy UI until we have better app support + mProxySettingsSpinner.setVisibility(View.GONE); + mView.findViewById(R.id.proxy_settings_title).setVisibility(View.GONE); mProxySettingsSpinner.setOnItemSelectedListener(this); ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);