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

Clean up NetworkServices from setTemplate

Browse Source 
Not used any more.

Bug: 290856342
Test: manual - on mobile settings
Test: m RunSettingsRoboTests
Test: unit test
Change-Id: I9c8dde2a8812e83e535d15713ccbf25b42f1f303
This commit is contained in:
Chaohui Wang
2023-09-21 12:46:50 +08:00
parent ba1ec910ac
commit c39acee194
12 changed files with 24 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -183,9 +183,8 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
private void addMobileSection(int subId, SubscriptionInfo subInfo) {
TemplatePreferenceCategory category = (TemplatePreferenceCategory)
inflatePreferences(R.xml.data_usage_cellular);
category.setTemplate(DataUsageLib.getMobileTemplate(getContext(), subId),
subId, services);
category.pushTemplates(services);
category.setTemplate(DataUsageLib.getMobileTemplate(getContext(), subId), subId);
category.pushTemplates();
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
subInfo, getContext());
if (subInfo != null && !TextUtils.isEmpty(displayName)) {
@@ -198,15 +197,14 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
void addWifiSection() {
TemplatePreferenceCategory category = (TemplatePreferenceCategory)
inflatePreferences(R.xml.data_usage_wifi);
category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(),
0, services);
category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build(), 0);
}
private void addEthernetSection() {
TemplatePreferenceCategory category = (TemplatePreferenceCategory)
inflatePreferences(R.xml.data_usage_ethernet);
category.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(),
0, services);
category.setTemplate(
new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build(), 0);
}
private Preference inflatePreferences(int resId) {
@@ -259,10 +257,10 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
private void updateState() {
PreferenceScreen screen = getPreferenceScreen();
for (int i = 1; i < screen.getPreferenceCount(); i++) {
Preference currentPreference = screen.getPreference(i);
if (currentPreference instanceof TemplatePreferenceCategory) {
((TemplatePreferenceCategory) currentPreference).pushTemplates(services);
}
Preference currentPreference = screen.getPreference(i);
if (currentPreference instanceof TemplatePreferenceCategory) {
((TemplatePreferenceCategory) currentPreference).pushTemplates();
}
}
}