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

Commit 4a99c365 authored by Doris Ling's avatar Doris Ling
Browse files

Rename NetworkCycleData to NetworkCycleChartData. 

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I47c1bbe09f11f4d0bd0d41c1f9d4c3e5a3773f05
parent 5d397194

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

+13 −13
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.text.format.Formatter; 
import android.text.style.ForegroundColorSpan;

import android.util.AttributeSet;

import android.util.FeatureFlagUtils;

import android.util.Pair;

import android.util.SparseIntArray;



import androidx.annotation.VisibleForTesting;
@@ -35,6 +34,7 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.core.FeatureFlags;

import com.android.settings.widget.UsageView;

import com.android.settingslib.net.NetworkCycleChartData;

import com.android.settingslib.net.NetworkCycleData;



import java.util.List;
@@ -53,7 +53,7 @@ public class ChartDataUsagePreference extends Preference { 
    private long mEnd;

    @Deprecated

    private NetworkStatsHistory mNetwork;

    private NetworkCycleData mNetworkCycleData;

    private NetworkCycleChartData mNetworkCycleChartData;

    private int mSecondaryColor;

    private int mSeriesColor;
@@ -70,7 +70,7 @@ public class ChartDataUsagePreference extends Preference { 
        super.onBindViewHolder(holder);

        final UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {

            if (mNetworkCycleData == null) {

            if (mNetworkCycleChartData == null) {

                return;

            }

        } else {
@@ -83,7 +83,7 @@ public class ChartDataUsagePreference extends Preference { 
        chart.clearPaths();

        chart.configureGraph(toInt(mEnd - mStart), top);

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {

            calcPoints(chart, mNetworkCycleData.usageBuckets);

            calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());

        } else {

            calcPoints(chart);

        }
@@ -98,7 +98,7 @@ public class ChartDataUsagePreference extends Preference { 
    public int getTop() {

        long totalData = 0;

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {

            totalData = mNetworkCycleData.totalUsage;

            totalData = mNetworkCycleChartData.getTotalUsage();

        } else {

            NetworkStatsHistory.Entry entry = null;

            final int start = mNetwork.getIndexBefore(mStart);
@@ -158,14 +158,14 @@ public class ChartDataUsagePreference extends Preference { 


        long totalData = 0;

        for (NetworkCycleData data : usageSummary) {

            final long startTime = data.startTime;

            final long endTime = data.endTime;

            final long startTime = data.getStartTime();

            final long endTime = data.getEndTime();



            // increment by current bucket total

            totalData += data.totalUsage;

            totalData += data.getTotalUsage();



            if (points.size() == 1) {

                points.put(toInt(data.startTime - mStart) - 1, -1);

                points.put(toInt(startTime - mStart) - 1, -1);

            }

            points.put(toInt(startTime - mStart + 1), (int) (totalData / RESOLUTION));

            points.put(toInt(endTime - mStart), (int) (totalData / RESOLUTION));
@@ -241,10 +241,10 @@ public class ChartDataUsagePreference extends Preference { 
        notifyChanged();

    }



    public void setNetworkCycleData(NetworkCycleData data) {

        mNetworkCycleData = data;

        mStart = data.startTime;

        mEnd = data.endTime;

    public void setNetworkCycleData(NetworkCycleChartData data) {

        mNetworkCycleChartData = data;

        mStart = data.getStartTime();

        mEnd = data.getEndTime();

        notifyChanged();

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> { 
     * Rebuild list based on network data. Always selects the newest item,

     * updating the inspection range on chartData.

     */

    public boolean updateCycleList(List<NetworkCycleData> cycleData) {

    public boolean updateCycleList(List<? extends NetworkCycleData> cycleData) {

        // stash away currently selected cycle to try restoring below

        final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)

            mSpinner.getSelectedItem();
@@ -164,7 +164,7 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> { 


        final Context context = getContext();

        for (NetworkCycleData data : cycleData) {

            add(new CycleAdapter.CycleItem(context, data.startTime, data.endTime));

            add(new CycleAdapter.CycleItem(context, data.getStartTime(), data.getEndTime()));

        }



        // force pick the current cycle (first item)

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

+11 −11
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ import com.android.settings.datausage.CycleAdapter.SpinnerInterface; 
import com.android.settings.widget.LoadingViewController;

import com.android.settingslib.AppItem;

import com.android.settingslib.net.ChartDataLoaderCompat;

import com.android.settingslib.net.NetworkCycleDataLoader;

import com.android.settingslib.net.NetworkCycleData;

import com.android.settingslib.net.NetworkCycleChartDataLoader;

import com.android.settingslib.net.NetworkCycleChartData;

import com.android.settingslib.net.NetworkStatsSummaryLoader;

import com.android.settingslib.net.UidDetailProvider;
@@ -107,7 +107,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment { 
    int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    @VisibleForTesting

    int mNetworkType;

    private List<NetworkCycleData> mCycleData;

    private List<NetworkCycleChartData> mCycleData;



    private LoadingViewController mLoadingViewController;

    private UidDetailProvider mUidDetailProvider;
@@ -322,7 +322,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment { 
                mNetworkStatsDetailCallbacks);



        final long totalBytes = mCycleData != null

            ? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).totalUsage : 0;

            ? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).getTotalUsage() : 0;

        final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(getActivity(), totalBytes);

        mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase));

    }
@@ -485,11 +485,11 @@ public class DataUsageListV2 extends DataUsageBaseFragment { 
        }

    };



    private final LoaderCallbacks<List<NetworkCycleData>> mNetworkCycleDataCallbacks =

            new LoaderCallbacks<List<NetworkCycleData>>() {

    private final LoaderCallbacks<List<NetworkCycleChartData>> mNetworkCycleDataCallbacks =

            new LoaderCallbacks<List<NetworkCycleChartData>>() {

        @Override

        public Loader<List<NetworkCycleData>> onCreateLoader(int id, Bundle args) {

            return new NetworkCycleDataLoader.Builder(getContext())

        public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {

            return NetworkCycleChartDataLoader.builder(getContext())

                    .setNetworkPolicy(services.mPolicyEditor.getPolicy(mTemplate))

                    .setNetworkType(mNetworkType)

                    .setNetworkTemplate(mTemplate)
@@ -498,8 +498,8 @@ public class DataUsageListV2 extends DataUsageBaseFragment { 
        }



        @Override

        public void onLoadFinished(Loader<List<NetworkCycleData>> loader,

                List<NetworkCycleData> data) {

        public void onLoadFinished(Loader<List<NetworkCycleChartData>> loader,

                List<NetworkCycleChartData> data) {

            mLoadingViewController.showContent(false /* animate */);

            mCycleData = data;

            // calculate policy cycles based on available data
@@ -507,7 +507,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment { 
        }



        @Override

        public void onLoaderReset(Loader<List<NetworkCycleData>> loader) {

        public void onLoaderReset(Loader<List<NetworkCycleChartData>> loader) {

            mCycleData = null;

        }

    };