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

Commit ac951a69 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable hidden network spinner on existing networks" into pi-dev

parents 4bfbaa60 35b76437

src/com/android/settings/wifi/WifiConfigController.java

+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ public class WifiConfigController implements TextWatcher, 
        mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);

        mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);

        mHiddenSettingsSpinner.setOnItemSelectedListener(this);

        mHiddenSettingsSpinner.setEnabled(false);

        mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);

        mHiddenWarningView.setVisibility(

                mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK
@@ -238,6 +239,8 @@ public class WifiConfigController implements TextWatcher, 
            showIpConfigFields();

            showProxyFields();

            mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);

            // Hidden option can be changed only when the user adds a network manually.

            mHiddenSettingsSpinner.setEnabled(true);

            ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))

                    .setOnCheckedChangeListener(this);

tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java

+10 −0
Original line number Diff line number Diff line
@@ -258,6 +258,16 @@ public class WifiConfigControllerTest { 
        assertThat(warningView.getVisibility()).isEqualTo(View.GONE);

    }



    @Test

    public void hiddenView_isDisabledWhenAppropriate() {

        View hiddenSpinner = mView.findViewById(R.id.hidden_settings);

        assertThat(hiddenSpinner.isEnabled()).isFalse();



        mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,

                WifiConfigUiBase.MODE_CONNECT);

        assertThat(hiddenSpinner.isEnabled()).isTrue();

    }



    public class TestWifiConfigController extends WifiConfigController {



        private TestWifiConfigController(