Merge "Fix for affordances to add a mobile subscription" (6f822c10) · Commits · e / os / android_packages_apps_Settings

res/xml/mobile_network_list.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,11 +16,13 @@

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="mobile_network_list_screen"
		android:title="@string/network_settings_title">

		<Preference
		android:key="add_more"
		settings:isPreferenceVisible="false"
		android:title="@string/mobile_network_list_add_more"
		android:icon="@drawable/ic_menu_add"
		android:order="100" >

src/com/android/settings/network/MobileNetworkListController.java

+14 −7

Original line number	Diff line number	Diff line
		@@ -24,14 +24,10 @@ import android.content.Intent;
		import android.provider.Settings;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.euicc.EuiccManager;
		import android.util.ArrayMap;

		import androidx.lifecycle.Lifecycle;
		import androidx.lifecycle.LifecycleObserver;
		import androidx.lifecycle.OnLifecycleEvent;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.settings.R;
		import com.android.settings.network.telephony.MobileNetworkActivity;
		import com.android.settingslib.core.AbstractPreferenceController;
		@@ -39,6 +35,12 @@ import com.android.settingslib.core.AbstractPreferenceController;
		import java.util.List;
		import java.util.Map;

		import androidx.lifecycle.Lifecycle;
		import androidx.lifecycle.LifecycleObserver;
		import androidx.lifecycle.OnLifecycleEvent;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		/**
		* This populates the entries on a page which lists all available mobile subscriptions. Each entry
		* has the name of the subscription with some subtext giving additional detail, and clicking on the
		@@ -48,6 +50,9 @@ public class MobileNetworkListController extends AbstractPreferenceController im
		LifecycleObserver, SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
		private static final String TAG = "MobileNetworkListCtlr";

		@VisibleForTesting
		static final String KEY_ADD_MORE = "add_more";

		private SubscriptionManager mSubscriptionManager;
		private SubscriptionsChangeListener mChangeListener;
		private PreferenceScreen mPreferenceScreen;
		@@ -76,6 +81,8 @@ public class MobileNetworkListController extends AbstractPreferenceController im
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreferenceScreen = screen;
		final EuiccManager euiccManager = mContext.getSystemService(EuiccManager.class);
		mPreferenceScreen.findPreference(KEY_ADD_MORE).setVisible(euiccManager.isEnabled());
		update();
		}

		@@ -93,7 +100,7 @@ public class MobileNetworkListController extends AbstractPreferenceController im
		final List<SubscriptionInfo> subscriptions = SubscriptionUtil.getAvailableSubscriptions(
		mSubscriptionManager);
		for (SubscriptionInfo info : subscriptions) {
		int subId = info.getSubscriptionId();
		final int subId = info.getSubscriptionId();
		Preference pref = existingPreferences.remove(subId);
		if (pref == null) {
		pref = new Preference(mPreferenceScreen.getContext());

src/com/android/settings/network/MobileNetworkSummaryController.java

+22 −32

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.settings.network;

		import static android.telephony.TelephonyManager.MultiSimVariants.UNKNOWN;

		import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
		import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;

		@@ -25,7 +23,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.telephony.euicc.EuiccManager;

		import com.android.settings.R;
		@@ -52,7 +49,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController

		private SubscriptionManager mSubscriptionManager;
		private SubscriptionsChangeListener mChangeListener;
		private TelephonyManager mTelephonyMgr;
		private EuiccManager mEuiccManager;
		private AddPreference mPreference;

		@@ -74,7 +70,6 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
		public MobileNetworkSummaryController(Context context, Lifecycle lifecycle) {
		super(context);
		mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
		mTelephonyMgr = mContext.getSystemService(TelephonyManager.class);
		mEuiccManager = mContext.getSystemService(EuiccManager.class);
		if (lifecycle != null) {
		mChangeListener = new SubscriptionsChangeListener(context, this);
		@@ -124,41 +119,35 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
		mContext.startActivity(intent);
		}

		private boolean shouldShowAddButton() {
		// The add button should only show up if the device is in multi-sim mode and the eSIM
		// manager is enabled.
		return mTelephonyMgr.getMultiSimConfiguration() != UNKNOWN && mEuiccManager.isEnabled();
		}

		private void update() {
		if (mPreference == null) {
		return;
		}
		final boolean showAddButton = shouldShowAddButton();
		refreshSummary(mPreference);
		if (!showAddButton) {
		mPreference.setOnAddClickListener(null);
		} else {
		mPreference.setAddWidgetEnabled(!mChangeListener.isAirplaneModeOn());
		mPreference.setOnAddClickListener(p -> {
		startAddSimFlow();
		});
		}
		final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(
		mSubscriptionManager);
		mPreference.setOnPreferenceClickListener(null);
		mPreference.setOnAddClickListener(null);
		mPreference.setFragment(null);
		mPreference.setEnabled(!mChangeListener.isAirplaneModeOn());

		final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(
		mSubscriptionManager);

		if (subs.isEmpty()) {
		if (showAddButton) {
		mPreference.setEnabled(false);
		} else if (mEuiccManager.isEnabled()) {
		if (mEuiccManager.isEnabled()) {
		mPreference.setOnPreferenceClickListener((Preference pref) -> {
		startAddSimFlow();
		return true;
		});
		}
		} else if (subs.size() == 1) {
		} else {
		// We have one or more existing subscriptions, so we want the plus button if eSIM is
		// supported.
		if (mEuiccManager.isEnabled()) {
		mPreference.setAddWidgetEnabled(!mChangeListener.isAirplaneModeOn());
		mPreference.setOnAddClickListener(p -> startAddSimFlow());
		}

		if (subs.size() == 1) {
		mPreference.setOnPreferenceClickListener((Preference pref) -> {
		final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
		mContext.startActivity(intent);
		@@ -168,6 +157,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
		mPreference.setFragment(MobileNetworkListFragment.class.getCanonicalName());
		}
		}
		}

		@Override
		public boolean isAvailable() {

tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.times;
		@@ -31,6 +32,7 @@ import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		import android.telephony.SubscriptionInfo;
		import android.telephony.euicc.EuiccManager;

		import org.junit.After;
		import org.junit.Before;
		@@ -50,6 +52,9 @@ import androidx.preference.PreferenceScreen;

		@RunWith(RobolectricTestRunner.class)
		public class MobileNetworkListControllerTest {
		@Mock
		EuiccManager mEuiccManager;

		@Mock
		private Lifecycle mLifecycle;

		@@ -58,12 +63,17 @@ public class MobileNetworkListControllerTest {

		private Context mContext;
		private MobileNetworkListController mController;
		private Preference mAddMorePreference;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mContext = spy(Robolectric.setupActivity(Activity.class));
		when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager);
		when(mPreferenceScreen.getContext()).thenReturn(mContext);
		mAddMorePreference = new Preference(mContext);
		when(mPreferenceScreen.findPreference(MobileNetworkListController.KEY_ADD_MORE)).thenReturn(
		mAddMorePreference);
		mController = new MobileNetworkListController(mContext, mLifecycle);
		}

		@@ -78,6 +88,22 @@ public class MobileNetworkListControllerTest {
		mController.onResume();
		}

		@Test
		public void displayPreference_eSimNotSupported_addMoreLinkNotVisible() {
		when(mEuiccManager.isEnabled()).thenReturn(false);
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		assertThat(mAddMorePreference.isVisible()).isFalse();
		}

		@Test
		public void displayPreference_eSimSupported_addMoreLinkIsVisible() {
		when(mEuiccManager.isEnabled()).thenReturn(true);
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		assertThat(mAddMorePreference.isVisible()).isTrue();
		}

		@Test
		public void displayPreference_twoSubscriptions_correctlySetup() {
		final SubscriptionInfo sub1 = createMockSubscription(1, "sub1");

tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java

+11 −37

Original line number	Diff line number	Diff line
		@@ -16,13 +16,9 @@

		package com.android.settings.network;

		import static android.telephony.TelephonyManager.MultiSimVariants.DSDS;
		import static android.telephony.TelephonyManager.MultiSimVariants.UNKNOWN;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.ArgumentMatchers.isNull;
		import static org.mockito.ArgumentMatchers.notNull;
		import static org.mockito.Mockito.atLeastOnce;
		import static org.mockito.Mockito.mock;
		@@ -37,7 +33,6 @@ import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.provider.Settings;
		import android.telephony.SubscriptionInfo;
		import android.telephony.TelephonyManager;
		import android.telephony.euicc.EuiccManager;
		import android.text.TextUtils;

		@@ -64,8 +59,6 @@ public class MobileNetworkSummaryControllerTest {
		@Mock
		private Lifecycle mLifecycle;
		@Mock
		private TelephonyManager mTelephonyManager;
		@Mock
		private EuiccManager mEuiccManager;
		@Mock
		private PreferenceScreen mPreferenceScreen;
		@@ -78,9 +71,7 @@ public class MobileNetworkSummaryControllerTest {
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mContext = spy(Robolectric.setupActivity(Activity.class));
		when(mContext.getSystemService(eq(TelephonyManager.class))).thenReturn(mTelephonyManager);
		when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager);
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(UNKNOWN);
		when(mEuiccManager.isEnabled()).thenReturn(true);

		mController = new MobileNetworkSummaryController(mContext, mLifecycle);
		@@ -97,7 +88,7 @@ public class MobileNetworkSummaryControllerTest {

		@Test
		public void isAvailable_wifiOnlyMode_notAvailable() {
		ConnectivityManager cm = mock(ConnectivityManager.class);
		final ConnectivityManager cm = mock(ConnectivityManager.class);
		when(cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
		when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(cm);
		assertThat(mController.isAvailable()).isFalse();
		@@ -212,14 +203,16 @@ public class MobileNetworkSummaryControllerTest {
		}

		@Test
		public void addButton_noSubscriptionsSingleSimMode_noAddClickListener() {
		public void addButton_noSubscriptionsNoEuiccMgr_noAddClickListener() {
		when(mEuiccManager.isEnabled()).thenReturn(false);
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		verify(mPreference, never()).setOnAddClickListener(notNull());
		}

		@Test
		public void addButton_oneSubscriptionSingleSimMode_noAddClickListener() {
		public void addButton_oneSubscriptionNoEuiccMgr_noAddClickListener() {
		when(mEuiccManager.isEnabled()).thenReturn(false);
		final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
		SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
		mController.displayPreference(mPreferenceScreen);
		@@ -228,50 +221,33 @@ public class MobileNetworkSummaryControllerTest {
		}

		@Test
		public void addButton_noSubscriptionsMultiSimModeNoEuiccMgr_noAddClickListener() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		when(mEuiccManager.isEnabled()).thenReturn(false);
		public void addButton_noSubscriptions_noAddClickListener() {
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		verify(mPreference, never()).setOnAddClickListener(notNull());
		}

		@Test
		public void addButton_noSubscriptionsMultiSimMode_hasAddClickListenerAndPrefDisabled() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		assertThat(mPreference.isEnabled()).isFalse();
		verify(mPreference, never()).setOnAddClickListener(isNull());
		verify(mPreference).setOnAddClickListener(notNull());
		}

		@Test
		public void addButton_oneSubscriptionMultiSimMode_hasAddClickListener() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		public void addButton_oneSubscription_hasAddClickListener() {
		final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
		SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		verify(mPreference, never()).setOnAddClickListener(isNull());
		verify(mPreference).setOnAddClickListener(notNull());
		}

		@Test
		public void addButton_twoSubscriptionsMultiSimMode_hasAddClickListener() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		public void addButton_twoSubscriptions_hasAddClickListener() {
		final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
		final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
		SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
		mController.displayPreference(mPreferenceScreen);
		mController.onResume();
		verify(mPreference, never()).setOnAddClickListener(isNull());
		verify(mPreference).setOnAddClickListener(notNull());
		}

		@Test
		public void addButton_oneSubscriptionAirplaneModeTurnedOn_addButtonGetsDisabled() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
		SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
		mController.displayPreference(mPreferenceScreen);
		@@ -280,14 +256,13 @@ public class MobileNetworkSummaryControllerTest {
		Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
		mController.onAirplaneModeChanged(true);

		ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
		final ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
		verify(mPreference, atLeastOnce()).setAddWidgetEnabled(captor.capture());
		assertThat(captor.getValue()).isFalse();
		}

		@Test
		public void onResume_oneSubscriptionAirplaneMode_isDisabled() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
		final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
		SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
		@@ -296,7 +271,7 @@ public class MobileNetworkSummaryControllerTest {

		assertThat(mPreference.isEnabled()).isFalse();

		ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
		final ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
		verify(mPreference, atLeastOnce()).setAddWidgetEnabled(captor.capture());
		assertThat(captor.getValue()).isFalse();
		}
		@@ -318,7 +293,6 @@ public class MobileNetworkSummaryControllerTest {

		@Test
		public void onAirplaneModeChanged_oneSubscriptionAirplaneModeGetsTurnedOff_isEnabled() {
		when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(DSDS);
		Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
		final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
		SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
		@@ -332,7 +306,7 @@ public class MobileNetworkSummaryControllerTest {

		assertThat(mPreference.isEnabled()).isTrue();

		ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
		final ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
		verify(mPreference, atLeastOnce()).setAddWidgetEnabled(eq(false));
		verify(mPreference, atLeastOnce()).setAddWidgetEnabled(captor.capture());
		assertThat(captor.getValue()).isTrue();