Merge "Hide entire hidden field for non-hidden networks" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2c793dfeff
@@ -259,26 +259,13 @@ public class WifiConfigControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void hiddenView_isDisabledWhenAppropriate() {
|
||||
View hiddenSpinner = mView.findViewById(R.id.hidden_settings);
|
||||
assertThat(hiddenSpinner.isEnabled()).isFalse();
|
||||
public void hiddenField_visibilityUpdatesCorrectly() {
|
||||
View hiddenField = mView.findViewById(R.id.hidden_settings_field);
|
||||
assertThat(hiddenField.getVisibility()).isEqualTo(View.GONE);
|
||||
|
||||
mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase.MODE_CONNECT);
|
||||
assertThat(hiddenSpinner.isEnabled()).isTrue();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void hiddenSpinner_visibilityUpdatesCorrectly() {
|
||||
View hiddenSpinner = mView.findViewById(R.id.hidden_settings);
|
||||
assertThat(hiddenSpinner.isEnabled()).isFalse();
|
||||
assertThat(hiddenSpinner.getVisibility()).isEqualTo(View.GONE);
|
||||
|
||||
mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
|
||||
WifiConfigUiBase.MODE_CONNECT);
|
||||
assertThat(hiddenSpinner.isEnabled()).isTrue();
|
||||
assertThat(hiddenSpinner.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(hiddenField.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
public class TestWifiConfigController extends WifiConfigController {
|
||||
|
Reference in New Issue
Block a user