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

Merge "[Satellite] Satellite UX changes in SIM settings as per new UX design." into main

Browse Source
This commit is contained in:
Arun Voddu
2025-01-10 05:11:45 -08:00
committed by Android (Google) Code Review
parent 1b1fe46c5f 4da20d24c4
commit ca666039d8
3 changed files with 7 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/unit/src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryControllerTest.java
View File

@@ -16,13 +16,12 @@
package com.android.settings.network.telephony;
import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.assertEquals;
import static org.mockito.Mockito.spy;
import android.content.Context;
@@ -35,8 +34,6 @@ import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -72,24 +69,6 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {
assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
@Ignore("b/382664790")
public void setPreferenceTitle_hasDataService_showConnectivity() {
PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
preferenceCategory.setKey(KEY);
preferenceCategory.addPreference(new Preference(mContext));
preferenceScreen.addPreference(preferenceCategory);
mController.displayPreference(preferenceScreen);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
new int[]{SERVICE_TYPE_DATA});
assertThat(preferenceCategory.getTitle()).isEqualTo(
mContext.getString(R.string.title_satellite_setting_connectivity));
}
@Test
@Ignore("b/382664790")
public void setPreferenceTitle_hasSmsService_showMessaging() {
@@ -101,10 +80,6 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {
preferenceCategory.addPreference(new Preference(mContext));
mController.displayPreference(preferenceScreen);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
new int[]{SERVICE_TYPE_SMS});
assertThat(preferenceCategory.getTitle()).isEqualTo(
mContext.getString(R.string.satellite_setting_title));
assertEquals(preferenceCategory.getTitle(), "Satellite connectivity");
}
}