Merge "Hide entire hidden field for non-hidden networks" into pi-dev am: 2c793dfeff
am: 1a2153e6ab
Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
This commit is contained in:
@@ -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