Merge "Revert "[Settings] Request focus in Add network dialog""
This commit is contained in:
@@ -215,7 +215,6 @@ public class WifiConfigController implements TextWatcher,
|
|||||||
|
|
||||||
mSsidView = (TextView) mView.findViewById(R.id.ssid);
|
mSsidView = (TextView) mView.findViewById(R.id.ssid);
|
||||||
mSsidView.addTextChangedListener(this);
|
mSsidView.addTextChangedListener(this);
|
||||||
mSsidView.requestFocus();
|
|
||||||
mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
|
mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
|
||||||
mSecuritySpinner.setOnItemSelectedListener(this);
|
mSecuritySpinner.setOnItemSelectedListener(this);
|
||||||
mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
|
mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
|
||||||
|
|||||||
@@ -210,15 +210,6 @@ public class WifiConfigControllerTest {
|
|||||||
assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.GONE);
|
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 {
|
public class TestWifiConfigController extends WifiConfigController {
|
||||||
|
|
||||||
private TestWifiConfigController(
|
private TestWifiConfigController(
|
||||||
|
|||||||
Reference in New Issue
Block a user