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

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

Merge "[Settings] Request focus in Add network dialog"

parents 0c2cd535 49d314f8

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

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ public class WifiConfigController implements TextWatcher, 


            mSsidView = (TextView) mView.findViewById(R.id.ssid);

            mSsidView.addTextChangedListener(this);

            mSsidView.requestFocus();

            mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));

            mSecuritySpinner.setOnItemSelectedListener(this);

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

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

+9 −0
Original line number Diff line number Diff line
@@ -210,6 +210,15 @@ public class WifiConfigControllerTest { 
        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.GONE);

    }



    @Test

    public void ssidGetFocus_addNewNetwork_shouldReturnTrue() {

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

                WifiConfigUiBase.MODE_CONNECT);

        final TextView ssid = mView.findViewById(R.id.ssid);

        // Verify ssid text get focus when add new network (accesspoint is null)

        assertThat(ssid.isFocused()).isTrue();

    }



    public class TestWifiConfigController extends WifiConfigController {



        private TestWifiConfigController(