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

Merge "Show dialog on Wifi, and APM' entries in Settings" into main

Browse Source
This commit is contained in:
Tom Hsu
2024-05-08 04:37:28 +00:00
committed by Android (Google) Code Review
parent 23349d60c0 29b2f16edf
commit c495d92a25
6 changed files with 142 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
View File

@@ -18,12 +18,15 @@ package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.util.AndroidRuntimeException;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.widget.SwitchWidgetController;
@@ -65,4 +68,17 @@ public class WifiEnablerTest {
assertThat(mEnabler.onSwitchToggled(true)).isTrue();
}
@Test
public void onSwitchToggled_satelliteOn_startWarningActivity() {
mEnabler.mIsSatelliteOn.set(true);
try {
mEnabler.onSwitchToggled(true);
} catch (AndroidRuntimeException e) {
// Catch exception of starting activity .
}
verify(mContext).startActivity(any());
}
}

23
tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
View File

@@ -16,10 +16,14 @@
package com.android.settings.network;
import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
@@ -28,6 +32,7 @@ import android.content.pm.PackageManager;
import android.os.Looper;
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
import android.util.AndroidRuntimeException;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
@@ -73,12 +78,12 @@ public class AirplaneModePreferenceControllerTest {
mResolver = mContext.getContentResolver();
doReturn(mPackageManager).when(mContext).getPackageManager();
mController = new AirplaneModePreferenceController(mContext,
SettingsSlicesContract.KEY_AIRPLANE_MODE);
KEY_AIRPLANE_MODE);
mPreferenceManager = new PreferenceManager(mContext);
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreference = new RestrictedSwitchPreference(mContext);
mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);
mPreference.setKey(KEY_AIRPLANE_MODE);
mScreen.addPreference(mPreference);
mController.setFragment(null);
}
@@ -167,4 +172,18 @@ public class AirplaneModePreferenceControllerTest {
public void isPublicSlice_returnsTrue() {
assertThat(mController.isPublicSlice()).isTrue();
}
@Test
public void handlePreferenceTreeClick_satelliteOn_startWarningActivity() {
mController.mIsSatelliteOn.set(true);
when(mAirplaneModeEnabler.isInEcmMode()).thenReturn(false);
try {
mController.handlePreferenceTreeClick(mPreference);
} catch (AndroidRuntimeException e) {
// Catch exception of starting activity .
}
verify(mContext).startActivity(any());
}
}