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

@@ -271,7 +271,7 @@
                 style="@style/wifi_item"
                 android:visibility="gone">
 
-            <TextView
+            <TextView android:id="@+id/proxy_settings_title"
                     style="@style/wifi_item_label"
                     android:text="@string/proxy_settings_title" />
 

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

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);