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

Merge "Add back the data saver preference." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-22 04:56:35 +00:00
committed by Android (Google) Code Review
parent c15e8d3d09 446cd9db73
commit ce447d9191
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,10 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable
private void updateState() {
PreferenceScreen screen = getPreferenceScreen();
for (int i = 1; i < screen.getPreferenceCount(); i++) {
((TemplatePreferenceCategory) screen.getPreference(i)).pushTemplates(services);
Preference currentPreference = screen.getPreference(i);
if (currentPreference instanceof TemplatePreferenceCategory) {
((TemplatePreferenceCategory) currentPreference).pushTemplates(services);
}
}
}

4
src/com/android/settings/datausage/DataUsageSummaryLegacy.java
View File

@@ -62,7 +62,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
static final boolean LOGD = false;
public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
public static final String KEY_RESTRICT_BACKGROUND = "restrict_background_legacy";
private static final String KEY_STATUS_HEADER = "status_header";
private static final String KEY_LIMIT_SUMMARY = "limit_summary";
@@ -370,7 +370,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
boolean enabled) {
List<SearchIndexableResource> resources = new ArrayList<>();
SearchIndexableResource resource = new SearchIndexableResource(context);
resource.xmlResId = R.xml.data_usage;
resource.xmlResId = R.xml.data_usage_legacy;
resources.add(resource);
resource = new SearchIndexableResource(context);