PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide http proxy UI"

Browse Source
This commit is contained in:
Robert Greenwalt
2010-12-29 16:26:35 -08:00
committed by Android (Google) Code Review
parent 39e1419d89 6f3a98bb00
commit 8a926aa499
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/wifi_dialog.xml
View File

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

2
src/com/android/settings/WirelessSettings.java
View File

@@ -135,6 +135,8 @@ public class WirelessSettings extends SettingsPreferenceFragment {
Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS); Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
DevicePolicyManager mDPM = (DevicePolicyManager) DevicePolicyManager mDPM = (DevicePolicyManager)
activity.getSystemService(Context.DEVICE_POLICY_SERVICE); activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
// proxy UI disabled until we have better app support
getPreferenceScreen().removePreference(mGlobalProxy);
mGlobalProxy.setEnabled(mDPM.getGlobalProxyAdmin() == null); mGlobalProxy.setEnabled(mDPM.getGlobalProxyAdmin() == null);
// Disable Tethering if it's not allowed // Disable Tethering if it's not allowed

3
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -166,6 +166,9 @@ public class WifiConfigController implements TextWatcher,
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings); mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this); mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings); 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); mProxySettingsSpinner.setOnItemSelectedListener(this);
ViewGroup group = (ViewGroup) mView.findViewById(R.id.info); ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);