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

Improve satellite category visiblity logic.

Browse Source 
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: make pass
Test: manual test
Change-Id: If5df345a631006e7efc41471b6cd6419ca4b3d79
This commit is contained in:
tomhsu
2024-12-06 14:44:26 +00:00
parent 3859a8adaa
commit ef835bb57d
2 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ 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.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
@@ -39,6 +38,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,7 +47,7 @@ import org.mockito.junit.MockitoRule;
@RunWith(AndroidJUnit4.class)
public class SatelliteSettingsPreferenceCategoryControllerTest {
private static final String KEY = "key";
private static final String KEY = "telephony_satellite_settings_category_key";
private static final int TEST_SUB_ID = 0;
@Rule
@@ -66,48 +66,21 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {
}
@Test
@Ignore("b/382664790")
public void getAvailabilityStatus_default_returnUnsupported() {
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
public void getAvailabilityStatus_hasAvailablePreference_returnAvailableUnsearchable() {
PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
preferenceCategory.setKey(KEY);
preferenceScreen.addPreference(preferenceCategory);
preferenceCategory.addPreference(new Preference(mContext));
mController.displayPreference(preferenceScreen);
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
assertThat(result).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
public void getAvailabilityStatus_noAvailablePreference_returnUnsupported() {
PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
preferenceCategory.setKey(KEY);
preferenceScreen.addPreference(preferenceCategory);
mController.displayPreference(preferenceScreen);
int result = mController.getAvailabilityStatus(TEST_SUB_ID);
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);
preferenceScreen.addPreference(preferenceCategory);
preferenceCategory.addPreference(new Preference(mContext));
preferenceScreen.addPreference(preferenceCategory);
mController.displayPreference(preferenceScreen);
mController.mCarrierRoamingNtnModeCallback.onCarrierRoamingNtnAvailableServicesChanged(
@@ -117,8 +90,8 @@ public class SatelliteSettingsPreferenceCategoryControllerTest {
mContext.getString(R.string.title_satellite_setting_connectivity));
}
@Test
@Ignore("b/382664790")
public void setPreferenceTitle_hasSmsService_showMessaging() {
PreferenceManager preferenceManager = new PreferenceManager(mContext);
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);