Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5161dccb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Address cleanup comments from aosp/1234607" am: 9dec7506 am: 008480e0 

Change-Id: I1fd1f571bc19a2c4aa1a1eb2346fa97d2932f2d9
parents 327db8c0 008480e0

src/com/android/settings/vpn2/ConfigDialog.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);