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

[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI

Browse Source 
Test: atest NetworkProviderCallsSmsFragmentTest, SubscriptionsPreferenceControllerTest
Bug: 197066557
Change-Id: I55e0fa2ca7317cd8c9d1bce7c229b8344f43cc92
This commit is contained in:
Zoey Chen
2021-11-15 14:50:01 +08:00
parent 2874b6442e
commit 5515e9bde5
7 changed files with 14 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -126,22 +126,13 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
}
return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
} else {
if (com.android.settings.Utils.isProviderModelEnabled(mContext)) {
return getSummaryForProviderModel(subs);
}
final int count = subs.size();
return mContext.getResources().getQuantityString(R.plurals.mobile_network_summary_count,
count, count);
return subs.stream()
.mapToInt(SubscriptionAnnotation::getSubscriptionId)
.mapToObj(subId -> mStatusCache.getDisplayName(subId))
.collect(Collectors.joining(", "));
}
}
private CharSequence getSummaryForProviderModel(List<SubscriptionAnnotation> subs) {
return subs.stream()
.mapToInt(SubscriptionAnnotation::getSubscriptionId)
.mapToObj(subId -> mStatusCache.getDisplayName(subId))
.collect(Collectors.joining(", "));
}
private void logPreferenceClick(Preference preference) {
mMetricsFeatureProvider.logClickedPreference(preference,
preference.getExtras().getInt(DashboardFragment.CATEGORY));

4
src/com/android/settings/network/MultiNetworkHeaderController.java
View File

@@ -32,9 +32,9 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
* are two or more active mobile subscriptions. It shows an overview of available network
* connections with an entry for wifi (if connected) and an entry for each subscription.
*
* TODO(tomhsu) when provider model is completed, this class will be replaced
* by {@link NetworkMobileProviderController}
* @deprecated This class will be removed in Android U, there is no networks header anymore.
*/
@Deprecated
public class MultiNetworkHeaderController extends BasePreferenceController implements
WifiConnectionPreferenceController.UpdateListener,
SubscriptionsPreferenceController.UpdateListener {

3
src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
View File

@@ -100,8 +100,7 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment {
@Override
protected boolean isPageSearchEnabled(Context context) {
return Utils.isProviderModelEnabled(context) &&
context.getSystemService(UserManager.class).isAdminUser();
return context.getSystemService(UserManager.class).isAdminUser();
}
};
}

81
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -74,15 +74,8 @@ import java.util.Map;
import java.util.Set;
/**
* If the provider model is not enabled, this controller manages a set of Preferences it places into
* a PreferenceGroup owned by some parent
* controller class - one for each available subscription. This controller is only considered
* available if there are 2 or more subscriptions.
*
* If the provider model is enabled, this controller manages preference with data subscription
* information and make its state display on preference.
* TODO this class will clean up the multiple subscriptions functionality after the provider
* model is released.
* This controller manages preference with data subscription information and make its state
* display on preference.
*/
public class SubscriptionsPreferenceController extends AbstractPreferenceController implements
LifecycleObserver, SubscriptionsChangeListener.SubscriptionsChangeListenerClient,
@@ -228,14 +221,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
return;
}
if (mSubsPrefCtrlInjector.isProviderModelEnabled(mContext)) {
updateForProvider();
} else {
updateForBase();
}
}
private void updateForProvider() {
SubscriptionInfo subInfo = mSubscriptionManager.getDefaultDataSubscriptionInfo();
if (subInfo == null) {
mPreferenceGroup.removeAll();
@@ -349,50 +334,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
mSubsGearPref.setSummary("");
}
private void updateForBase() {
final Map<Integer, Preference> existingPrefs = mSubscriptionPreferences;
mSubscriptionPreferences = new ArrayMap<>();
int order = mStartOrder;
final Set<Integer> activeSubIds = new ArraySet<>();
final int dataDefaultSubId = mSubsPrefCtrlInjector.getDefaultDataSubscriptionId();
for (SubscriptionInfo info :
SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager)) {
final int subId = info.getSubscriptionId();
// Avoid from showing subscription(SIM)s which has been marked as hidden
// For example, only one subscription will be shown when there're multiple
// subscriptions with same group UUID.
if (!mSubsPrefCtrlInjector.canSubscriptionBeDisplayed(mContext, subId)) {
continue;
}
activeSubIds.add(subId);
Preference pref = existingPrefs.remove(subId);
if (pref == null) {
pref = new Preference(mPreferenceGroup.getContext());
mPreferenceGroup.addPreference(pref);
}
pref.setTitle(SubscriptionUtil.getUniqueSubscriptionDisplayName(info, mContext));
final boolean isDefaultForData = (subId == dataDefaultSubId);
pref.setSummary(getSummary(subId, isDefaultForData));
setIcon(pref, subId, isDefaultForData);
pref.setOrder(order++);
pref.setOnPreferenceClickListener(clickedPref -> {
startMobileNetworkActivity(mContext, subId);
return true;
});
mSubscriptionPreferences.put(subId, pref);
}
mSignalStrengthListener.updateSubscriptionIds(activeSubIds);
// Remove any old preferences that no longer map to a subscription.
for (Preference pref : existingPrefs.values()) {
mPreferenceGroup.removePreference(pref);
}
mUpdateListener.onChildrenUpdated();
}
private static void startMobileNetworkActivity(Context context, int subId) {
final Intent intent = new Intent(context, MobileNetworkActivity.class);
intent.putExtra(Settings.EXTRA_SUB_ID, subId);
@@ -472,8 +413,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
}
/**
* @return true if there are at least 2 available subscriptions,
* or if there is at least 1 available subscription for provider model.
* @return true if there is at least 1 available subscription.
*/
@Override
public boolean isAvailable() {
@@ -492,7 +432,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
.filter(subInfo ->
mSubsPrefCtrlInjector.canSubscriptionBeDisplayed(mContext,
subInfo.getSubscriptionId()))
.count() >= (mSubsPrefCtrlInjector.isProviderModelEnabled(mContext) ? 1 : 2);
.count() >= 1;
}
@Override
@@ -537,12 +477,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
update();
}
@VisibleForTesting
boolean canSubscriptionBeDisplayed(Context context, int subId) {
return (SubscriptionUtil.getAvailableSubscription(context,
ProxySubscriptionManager.getInstance(context), subId) != null);
}
public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
mWifiPickerTrackerHelper = helper;
}
@@ -602,13 +536,6 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
return MobileNetworkUtils.activeNetworkIsCellular(context);
}
/**
* Confirms the flag of Provider Model switch is turned on or not.
*/
public boolean isProviderModelEnabled(Context context) {
return Utils.isProviderModelEnabled(context);
}
/**
* Gets config for carrier customization.
*/