Merge "[Wi-Fi] Cannot connect to hidden WiFi network." (fcfff7a7) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_dialog.xml

+28 −28

Original line number	Diff line number	Diff line
		@@ -373,6 +373,34 @@
		android:orientation="vertical"
		android:visibility="gone">

		<LinearLayout android:id="@+id/hidden_settings_field"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		style="@style/wifi_item">

		<TextView android:id="@+id/hidden_settings_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/wifi_item_label"
		android:text="@string/wifi_hidden_network" />

		<Spinner android:id="@+id/hidden_settings"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_spinner"
		android:prompt="@string/wifi_hidden_network"
		android:entries="@array/wifi_hidden_entries"/>

		<TextView android:id="@+id/hidden_settings_warning"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:padding="8dp"
		android:text="@string/wifi_hidden_network_warning"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:visibility="gone"/>
		</LinearLayout>

		<LinearLayout android:id="@+id/metered_settings_fields"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -677,34 +705,6 @@
		android:checked="true" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout android:id="@+id/hidden_settings_field"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		style="@style/wifi_item">

		<TextView android:id="@+id/hidden_settings_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/wifi_item_label"
		android:text="@string/wifi_hidden_network" />

		<Spinner android:id="@+id/hidden_settings"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_spinner"
		android:prompt="@string/wifi_hidden_network"
		android:entries="@array/wifi_hidden_entries"/>

		<TextView android:id="@+id/hidden_settings_warning"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:padding="8dp"
		android:text="@string/wifi_hidden_network_warning"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:visibility="gone"/>
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>
		</ScrollView>

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import android.view.ViewGroup;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.ArrayAdapter;
		import android.widget.CheckBox;
		import android.widget.LinearLayout;
		import android.widget.Spinner;
		import android.widget.TextView;

		@@ -546,4 +547,14 @@ public class WifiConfigControllerTest {

		assertThat(eapMethodSpinner.getSelectedItemPosition()).isEqualTo(Eap.TLS);
		}

		@Test
		public void getHiddenSettingsPosition_whenAdvancedToggled_shouldBeFirst() {
		final LinearLayout advancedFieldsLayout = mView.findViewById(R.id.wifi_advanced_fields);
		final LinearLayout hiddenSettingLayout = mView.findViewById(R.id.hidden_settings_field);

		final LinearLayout firstChild = (LinearLayout) advancedFieldsLayout.getChildAt(0);

		assertThat(firstChild).isEqualTo(hiddenSettingLayout);
		}
		}