Re-enable wifi proxy UI
- Add text to warn users about support - Move proxy above IP settings based on UI recommendations Bug: 3328410 Change-Id: I3b5aafd32b16adfcd2fadb572ebb2694afdeccbb
This commit is contained in:
@@ -173,9 +173,6 @@ 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);
|
||||
@@ -621,6 +618,7 @@ public class WifiConfigController implements TextWatcher,
|
||||
}
|
||||
|
||||
if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) {
|
||||
mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.VISIBLE);
|
||||
mView.findViewById(R.id.proxy_fields).setVisibility(View.VISIBLE);
|
||||
if (mProxyHostView == null) {
|
||||
mProxyHostView = (TextView) mView.findViewById(R.id.proxy_hostname);
|
||||
@@ -636,6 +634,7 @@ public class WifiConfigController implements TextWatcher,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.GONE);
|
||||
mView.findViewById(R.id.proxy_fields).setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user