Merge "SubscriptionsPreferenceController shows the unique sim description." (09f43be1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/IccLockSettings.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settings.network.ProxySubscriptionManager;
		import com.android.settings.network.SubscriptionUtil;

		import java.util.ArrayList;
		import java.util.List;
		@@ -310,7 +311,8 @@ public class IccLockSettings extends SettingsPreferenceFragment
		mTabHost.addTab(buildTabSpec(tag,
		String.valueOf(subInfo == null
		? getContext().getString(R.string.sim_editor_title, slot + 1)
		: subInfo.getDisplayName())));
		: SubscriptionUtil.getUniqueSubscriptionDisplayName(
		subInfo, getContext()))));
		}

		mTabHost.setCurrentTabByTag(getTagForSlotId(mSlotId));

src/com/android/settings/ResetNetwork.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import androidx.annotation.VisibleForTesting;
		import com.android.settings.core.InstrumentedFragment;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
		import com.android.settings.network.SubscriptionUtil;
		import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settings.password.ConfirmLockPattern;
		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		@@ -194,7 +195,8 @@ public class ResetNetwork extends InstrumentedFragment {
		// Set the first selected value to the default
		selectedIndex = subscriptionNames.size();
		}
		String name = record.getDisplayName().toString();
		String name = SubscriptionUtil.getUniqueSubscriptionDisplayName(
		record, getContext()).toString();
		if (TextUtils.isEmpty(name)) {
		name = record.getNumber();
		}

src/com/android/settings/datausage/CellDataPreference.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import androidx.preference.PreferenceViewHolder;
		import com.android.settings.R;
		import com.android.settings.network.MobileDataEnabledListener;
		import com.android.settings.network.ProxySubscriptionManager;
		import com.android.settings.network.SubscriptionUtil;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.CustomDialogPreferenceCompat;

		@@ -200,12 +201,14 @@ public class CellDataPreference extends CustomDialogPreferenceCompat

		final String previousName = (nextSir == null)
		? getContext().getResources().getString(R.string.sim_selection_required_pref)
		: nextSir.getDisplayName().toString();
		: SubscriptionUtil.getUniqueSubscriptionDisplayName(
		nextSir, getContext()).toString();

		builder.setTitle(R.string.sim_change_data_title);
		builder.setMessage(getContext().getString(R.string.sim_change_data_message,
		String.valueOf(currentSir != null ? currentSir.getDisplayName() : null),
		previousName));
		String.valueOf(currentSir != null
		? SubscriptionUtil.getUniqueSubscriptionDisplayName(currentSir, getContext())
		: null), previousName));

		builder.setPositiveButton(R.string.okay, listener);
		builder.setNegativeButton(R.string.cancel, null);

src/com/android/settings/datausage/DataUsageSummary.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import androidx.preference.PreferenceScreen;
		import com.android.settings.R;
		import com.android.settings.datausage.lib.DataUsageLib;
		import com.android.settings.network.ProxySubscriptionManager;
		import com.android.settings.network.SubscriptionUtil;
		import com.android.settingslib.NetworkPolicyEditor;
		import com.android.settingslib.core.AbstractPreferenceController;

		@@ -170,9 +171,11 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
		category.setTemplate(DataUsageLib.getMobileTemplate(getContext(), subId),
		subId, services);
		category.pushTemplates(services);
		if (subInfo != null && !TextUtils.isEmpty(subInfo.getDisplayName())) {
		final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
		subInfo, getContext());
		if (subInfo != null && !TextUtils.isEmpty(displayName)) {
		Preference title = category.findPreference(KEY_MOBILE_USAGE_TITLE);
		title.setTitle(subInfo.getDisplayName());
		title.setTitle(displayName);
		}
		}

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

+10 −8

Original line number	Diff line number	Diff line
		@@ -26,6 +26,12 @@ import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		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;
		@@ -35,12 +41,6 @@ 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
		@@ -106,7 +106,9 @@ public class MobileNetworkListController extends AbstractPreferenceController im
		pref = new Preference(mPreferenceScreen.getContext());
		mPreferenceScreen.addPreference(pref);
		}
		pref.setTitle(info.getDisplayName());
		final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
		info, mContext);
		pref.setTitle(displayName);

		if (info.isEmbedded()) {
		if (mSubscriptionManager.isActiveSubscriptionId(subId)) {
		@@ -121,7 +123,7 @@ public class MobileNetworkListController extends AbstractPreferenceController im
		pref.setSummary(mContext.getString(R.string.mobile_network_inactive_sim));
		} else {
		pref.setSummary(mContext.getString(R.string.mobile_network_tap_to_activate,
		SubscriptionUtil.getDisplayName(info)));
		displayName));
		}
		}