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

Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019

Browse Source 
Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e
This commit is contained in:
Automerger Merge Worker
2020-03-13 23:42:29 +00:00
parent e3aaaa8a59 008480e019
commit c7bd3a2336
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/vpn2/ConfigDialog.java
View File

@@ -342,14 +342,14 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
mView.findViewById(R.id.vpn_proxy_fields).setVisibility(visible); mView.findViewById(R.id.vpn_proxy_fields).setVisibility(visible);
} }
private boolean hasAdvancedOptionsEnabled() { private boolean isAdvancedOptionsEnabled() {
return mSearchDomains.getText().length() > 0 || mDnsServers.getText().length() > 0 || return mSearchDomains.getText().length() > 0 || mDnsServers.getText().length() > 0 ||
mRoutes.getText().length() > 0 || mProxyHost.getText().length() > 0 mRoutes.getText().length() > 0 || mProxyHost.getText().length() > 0
|| mProxyPort.getText().length() > 0; || mProxyPort.getText().length() > 0;
} }
private void configureAdvancedOptionsVisibility() { private void configureAdvancedOptionsVisibility() {
if (mShowOptions.isChecked() || hasAdvancedOptionsEnabled()) { if (mShowOptions.isChecked() || isAdvancedOptionsEnabled()) {
mView.findViewById(R.id.options).setVisibility(View.VISIBLE); mView.findViewById(R.id.options).setVisibility(View.VISIBLE);
mShowOptions.setVisibility(View.GONE); mShowOptions.setVisibility(View.GONE);