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

Merge "Fix Wi-Fi anonymous ID UI issue" into main

Browse Source
This commit is contained in:
Weng Su
2024-01-23 04:13:12 +00:00
committed by Android (Google) Code Review
parent d9e66ea97b dd1947c078
commit 3d34250209
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -1390,7 +1390,11 @@ public class WifiConfigController2 implements TextWatcher,
@VisibleForTesting @VisibleForTesting
void setAnonymousIdVisible() { void setAnonymousIdVisible() {
mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE); View view = mView.findViewById(R.id.l_anonymous);
if (view.getVisibility() == View.VISIBLE) {
return;
}
view.setVisibility(View.VISIBLE);
mEapAnonymousView.setText(DEFAULT_ANONYMOUS_ID); mEapAnonymousView.setText(DEFAULT_ANONYMOUS_ID);
} }

14
tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
View File

@@ -21,9 +21,11 @@ import static com.android.settings.wifi.WifiConfigController2.WIFI_EAP_METHOD_SI
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.eq; import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -997,6 +999,18 @@ public class WifiConfigController2Test {
assertThat(anonymousId.getText().toString()).isEqualTo(DEFAULT_ANONYMOUS_ID); assertThat(anonymousId.getText().toString()).isEqualTo(DEFAULT_ANONYMOUS_ID);
} }
@Test
public void setAnonymousIdVisible_viewIsVisible_doNotSetText() {
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
View anonymousLayout = mView.findViewById(R.id.l_anonymous);
mController.mEapAnonymousView = mock(TextView.class);
anonymousLayout.setVisibility(View.VISIBLE);
mController.setAnonymousIdVisible();
verify(mController.mEapAnonymousView, never()).setText(any(String.class));
}
private void setUpModifyingSavedCertificateConfigController(String savedCaCertificate, private void setUpModifyingSavedCertificateConfigController(String savedCaCertificate,
String savedUserCertificate) { String savedUserCertificate) {
final WifiConfiguration mockWifiConfig = spy(new WifiConfiguration()); final WifiConfiguration mockWifiConfig = spy(new WifiConfiguration());