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

Commit 52b723be authored by Chaohui Wang's avatar Chaohui Wang
Browse files

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

This reverts commit 6b379cd7.

Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
parent 134bea19

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

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



    private void onUpdateView() {

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

        UsageView chart = mUsageView;

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

            return;

        }

        final int top = getTop();

        mUsageView.clearPaths();

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

        calcPoints(mUsageView, mNetworkCycleChartData.getUsageBuckets());

        setupContentDescription(mUsageView, mNetworkCycleChartData.getUsageBuckets());

        mUsageView.setBottomLabels(new CharSequence[] {

        chart.clearPaths();

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

        calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());

        setupContentDescription(chart, mNetworkCycleChartData.getUsageBuckets());

        chart.setBottomLabels(new CharSequence[] {

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

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

        });



        bindNetworkPolicy(mUsageView, mPolicy, top);

        bindNetworkPolicy(chart, mPolicy, top);

    }



    public int getTop() {

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

+0 −3
Original line number Diff line number Diff line
@@ -345,9 +345,6 @@ 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