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

Commit 6b379cd7 authored by Bonian Chen's avatar Bonian Chen
Browse files

[Settings] Adjusting the control of display sequence (part 2) 

1. Add missing lines within file DataUsageList. (Which might lead to
   crash in some cases)
2. Change the naming based on comments within ag/17226775

Bug: 227266811
Test: robotest ChartDataUsagePreferenceTest DataUsageListTest
Change-Id: I4cde5a04befd058c2a1a3aa30826caa5b479b69f
parent 0e7f6a45

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

+7 −8
Original line number Diff line number Diff line
@@ -73,21 +73,20 @@ public class ChartDataUsagePreference extends Preference { 
    }



    private void onUpdateView() {

        UsageView chart = mUsageView;

        if ((chart == null) || (mNetworkCycleChartData == null)) {

        if ((mUsageView == null) || (mNetworkCycleChartData == null)) {

            return;

        }

        final int top = getTop();

        chart.clearPaths();

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

        calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());

        setupContentDescription(chart, mNetworkCycleChartData.getUsageBuckets());

        chart.setBottomLabels(new CharSequence[] {

        mUsageView.clearPaths();

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

        calcPoints(mUsageView, mNetworkCycleChartData.getUsageBuckets());

        setupContentDescription(mUsageView, mNetworkCycleChartData.getUsageBuckets());

        mUsageView.setBottomLabels(new CharSequence[] {

                Utils.formatDateRange(getContext(), mStart, mStart),

                Utils.formatDateRange(getContext(), mEnd, mEnd),

        });



        bindNetworkPolicy(chart, mPolicy, top);

        bindNetworkPolicy(mUsageView, mPolicy, top);

    }



    public int getTop() {

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

+3 −0
Original line number Diff line number Diff line
@@ -315,6 +315,9 @@ public class DataUsageList extends DataUsageBaseFragment 
     */

    @VisibleForTesting

    void updatePolicy() {

        if (mHeader == null) {

            return;

        }

        final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate);

        final View configureButton = mHeader.findViewById(R.id.filter_settings);

        //SUB SELECT