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

Add back the data saver preference.

Browse Source 
Bug: 70950124

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ia39cb62ec021ae568a76fed04776b5e531e63b36
This commit is contained in:
Andreas Terzis
2018-03-17 16:27:20 -07:00
parent b0f251597c
commit 446cd9db73
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/data_usage.xml
View File

@@ -24,4 +24,8 @@
android:key="status_header" android:key="status_header"
android:selectable="false" /> android:selectable="false" />
<com.android.settings.datausage.DataSaverPreference
android:key="restrict_background"
android:title="@string/data_saver_title"
android:fragment="com.android.settings.datausage.DataSaverSummary"/>
</PreferenceScreen> </PreferenceScreen>

2
res/xml/data_usage_legacy.xml
View File

@@ -34,7 +34,7 @@
settings:allowDividerBelow="true" /> settings:allowDividerBelow="true" />
<com.android.settings.datausage.DataSaverPreference <com.android.settings.datausage.DataSaverPreference
android:key="restrict_background" android:key="restrict_background_legacy"
android:title="@string/data_saver_title" android:title="@string/data_saver_title"
android:fragment="com.android.settings.datausage.DataSaverSummary" /> android:fragment="com.android.settings.datausage.DataSaverSummary" />

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

@@ -261,7 +261,10 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable
private void updateState() { private void updateState() {
PreferenceScreen screen = getPreferenceScreen(); PreferenceScreen screen = getPreferenceScreen();
for (int i = 1; i < screen.getPreferenceCount(); i++) { 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; 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_STATUS_HEADER = "status_header";
private static final String KEY_LIMIT_SUMMARY = "limit_summary"; private static final String KEY_LIMIT_SUMMARY = "limit_summary";
@@ -370,7 +370,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
boolean enabled) { boolean enabled) {
List<SearchIndexableResource> resources = new ArrayList<>(); List<SearchIndexableResource> resources = new ArrayList<>();
SearchIndexableResource resource = new SearchIndexableResource(context); SearchIndexableResource resource = new SearchIndexableResource(context);
resource.xmlResId = R.xml.data_usage; resource.xmlResId = R.xml.data_usage_legacy;
resources.add(resource); resources.add(resource);
resource = new SearchIndexableResource(context); resource = new SearchIndexableResource(context);