Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce447d91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents c15e8d3d 446cd9db

res/xml/data_usage.xml

+6 −2
Original line number Diff line number Diff line
@@ -24,4 +24,8 @@ 
        android:key="status_header"

        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>

res/xml/data_usage_legacy.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
            settings:allowDividerBelow="true" />



        <com.android.settings.datausage.DataSaverPreference

            android:key="restrict_background"

            android:key="restrict_background_legacy"

            android:title="@string/data_saver_title"

            android:fragment="com.android.settings.datausage.DataSaverSummary" />

src/com/android/settings/datausage/DataUsageSummary.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

          }

        }

    }

src/com/android/settings/datausage/DataUsageSummaryLegacy.java

+2 −2
Original line number Diff line number Diff line
@@ -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);