PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide entire hidden field for non-hidden networks" into pi-dev am: 2c793dfeff

Browse Source 
am: 1a2153e6ab

Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
This commit is contained in:
Daichi Ueura
2018-05-23 16:05:02 -07:00
committed by android-build-merger
parent a17d1b03dc 1a2153e6ab
commit cbd04dcade
3 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/wifi_dialog.xml
View File

@@ -604,6 +604,7 @@
<LinearLayout android:id="@+id/hidden_settings_field" <LinearLayout android:id="@+id/hidden_settings_field"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
style="@style/wifi_item"> style="@style/wifi_item">
<TextView android:id="@+id/hidden_settings_title" <TextView android:id="@+id/hidden_settings_title"

5
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -220,8 +220,6 @@ public class WifiConfigController implements TextWatcher,
mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings); mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings); mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
mHiddenSettingsSpinner.setOnItemSelectedListener(this); mHiddenSettingsSpinner.setOnItemSelectedListener(this);
mHiddenSettingsSpinner.setVisibility(View.GONE);
mHiddenSettingsSpinner.setEnabled(false);
mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning); mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);
mHiddenWarningView.setVisibility( mHiddenWarningView.setVisibility(
mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK mHiddenSettingsSpinner.getSelectedItemPosition() == NOT_HIDDEN_NETWORK
@@ -241,8 +239,7 @@ public class WifiConfigController implements TextWatcher,
showProxyFields(); showProxyFields();
mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE); mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
// Hidden option can be changed only when the user adds a network manually. // Hidden option can be changed only when the user adds a network manually.
mHiddenSettingsSpinner.setVisibility(View.VISIBLE); mView.findViewById(R.id.hidden_settings_field).setVisibility(View.VISIBLE);
mHiddenSettingsSpinner.setEnabled(true);
((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox)) ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox))
.setOnCheckedChangeListener(this); .setOnCheckedChangeListener(this);

21
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -259,26 +259,13 @@ public class WifiConfigControllerTest {
} }
@Test @Test
public void hiddenView_isDisabledWhenAppropriate() { public void hiddenField_visibilityUpdatesCorrectly() {
View hiddenSpinner = mView.findViewById(R.id.hidden_settings); View hiddenField = mView.findViewById(R.id.hidden_settings_field);
assertThat(hiddenSpinner.isEnabled()).isFalse(); assertThat(hiddenField.getVisibility()).isEqualTo(View.GONE);
mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */, mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
WifiConfigUiBase.MODE_CONNECT); WifiConfigUiBase.MODE_CONNECT);
assertThat(hiddenSpinner.isEnabled()).isTrue(); assertThat(hiddenField.getVisibility()).isEqualTo(View.VISIBLE);
}
@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);
} }
public class TestWifiConfigController extends WifiConfigController { public class TestWifiConfigController extends WifiConfigController {