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

Clean up unused MobilePlanPreferenceController

Browse Source 
Which can improve the latency of "Network & internet" page.

Bug: 311604902
Test: manual - on "Network & internet" page
Change-Id: If306e93491402278ede4f20591296765b30bde37
This commit is contained in:
Chaohui Wang
2023-11-24 23:55:14 +08:00
parent f122a93efc
commit a39905eabd
6 changed files with 5 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -15,27 +15,19 @@
*/
package com.android.settings.network;
import static com.android.settings.network.MobilePlanPreferenceController.MANAGE_MOBILE_PLAN_DIALOG_ID;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.LifecycleOwner;
import com.android.settings.R;
import com.android.settings.SettingsDumpService;
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
@@ -44,7 +36,7 @@ import java.util.List;
@SearchIndexable
public class NetworkDashboardFragment extends DashboardFragment implements
MobilePlanPreferenceHost, OnActivityResultListener {
OnActivityResultListener {
private static final String TAG = "NetworkDashboardFrag";
@@ -84,15 +76,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getSettingsLifecycle(), mMetricsFeatureProvider,
this /* fragment */, this /* mobilePlanHost */, this /* LifecycleOwner */);
return buildPreferenceControllers(context, getSettingsLifecycle(),
this /* LifecycleOwner */);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, MetricsFeatureProvider metricsFeatureProvider, Fragment fragment,
MobilePlanPreferenceHost mobilePlanHost, LifecycleOwner lifecycleOwner) {
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, mobilePlanHost);
Lifecycle lifecycle, LifecycleOwner lifecycleOwner) {
final InternetPreferenceController internetPreferenceController =
new InternetPreferenceController(context, lifecycle, lifecycleOwner);
@@ -102,7 +91,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
new PrivateDnsPreferenceController(context);
if (lifecycle != null) {
lifecycle.addObserver(mobilePlanPreferenceController);
lifecycle.addObserver(vpnPreferenceController);
lifecycle.addObserver(privateDnsPreferenceController);
}
@@ -113,7 +101,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(new TetherPreferenceController(context, lifecycle));
controllers.add(vpnPreferenceController);
controllers.add(new ProxyPreferenceController(context));
controllers.add(mobilePlanPreferenceController);
if (internetPreferenceController != null) {
controllers.add(internetPreferenceController);
}
@@ -126,36 +113,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
return controllers;
}
@Override
public void showMobilePlanMessageDialog() {
showDialog(MANAGE_MOBILE_PLAN_DIALOG_ID);
}
@Override
public Dialog onCreateDialog(int dialogId) {
Log.d(TAG, "onCreateDialog: dialogId=" + dialogId);
switch (dialogId) {
case MANAGE_MOBILE_PLAN_DIALOG_ID:
final MobilePlanPreferenceController controller =
use(MobilePlanPreferenceController.class);
return new AlertDialog.Builder(getActivity())
.setMessage(controller.getMobilePlanDialogMessage())
.setCancelable(false)
.setPositiveButton(com.android.internal.R.string.ok,
(dialog, id) -> controller.setMobilePlanDialogMessage(null))
.create();
}
return super.onCreateDialog(dialogId);
}
@Override
public int getDialogMetricsCategory(int dialogId) {
if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) {
return SettingsEnums.DIALOG_MANAGE_MOBILE_PLAN;
}
return 0;
}
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
@@ -173,20 +130,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
public List<AbstractPreferenceController> createPreferenceControllers(Context
context) {
return buildPreferenceControllers(context, null /* lifecycle */,
null /* metricsFeatureProvider */, null /* fragment */,
null /* mobilePlanHost */, null /* LifecycleOwner */);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
MobilePlanPreferenceController mppc =
new MobilePlanPreferenceController(context, null);
if (!mppc.isAvailable()) {
keys.add(MobilePlanPreferenceController.KEY_MANAGE_MOBILE_PLAN);
}
return keys;
null /* LifecycleOwner */);
}
};
}