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 part.4

Browse Source 
Test: atest NetworkDashboardFragmentTest
Bug: 197066557
Change-Id: I9781af3a53fe7050b414f0574abb7618f8d71707
This commit is contained in:
Zoey Chen
2021-12-15 16:13:14 +08:00
parent 4ae25ef592
commit ad79a1819f
4 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,9 +118,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(internetPreferenceController);
}
controllers.add(privateDnsPreferenceController);
if (Utils.isProviderModelEnabled(context)) {
controllers.add(new NetworkProviderCallsSmsController(context, lifecycle));
}
controllers.add(new NetworkProviderCallsSmsController(context, lifecycle));
return controllers;
}
@@ -155,20 +153,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.network_and_internet) {
@Override
// TODO(b/167474581): Should remove this method when Provider Model finished.
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
if (Utils.isProviderModelEnabled(context)) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.network_provider_internet;
return Arrays.asList(sir);
}
return super.getXmlResourcesToIndex(context, enabled);
}
new BaseSearchIndexProvider(R.xml.network_provider_internet) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context
context) {