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

Commit 932bb2ee authored by Matthew Fritze's avatar Matthew Fritze
Browse files

resolve merge conflicts of a04bf124 to master 

Change-Id: Ie8b93666d98832af510e76ec50af964e2460743b
parents 14e9535f a04bf124

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

+4 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.INetworkStatsSession;

import android.net.NetworkPolicy;

import android.net.NetworkTemplate;

import android.net.TrafficStats;

import android.os.Bundle;
@@ -71,7 +70,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs 
    private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";



    private DataUsageController mDataUsageController;

    private DataUsageInfoController mDataInfoControler;

    private DataUsageInfoController mDataInfoController;

    private SummaryPreference mSummaryPreference;

    private Preference mLimitPreference;

    private NetworkTemplate mDefaultTemplate;
@@ -83,7 +82,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs 


        boolean hasMobileData = hasMobileData(getContext());

        mDataUsageController = new DataUsageController(getContext());

        mDataInfoControler = new DataUsageInfoController();

        mDataInfoController = new DataUsageInfoController();

        addPreferencesFromResource(R.xml.data_usage);



        int defaultSubId = getDefaultSubscriptionId(getContext());
@@ -227,13 +226,13 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs 
        DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(

                mDefaultTemplate);

        Context context = getContext();

        mDataInfoControler.updateDataLimit(info,

        mDataInfoController.updateDataLimit(info,

                services.mPolicyEditor.getPolicy(mDefaultTemplate));



        if (mSummaryPreference != null) {

            mSummaryPreference.setTitle(

                    formatTitle(context, getString(mDataUsageTemplate), info.usageLevel));

            long limit = mDataInfoControler.getSummaryLimit(info);

            long limit = mDataInfoController.getSummaryLimit(info);

            mSummaryPreference.setSummary(info.period);

            mSummaryPreference.setLabels(Formatter.formatFileSize(context, 0),

                    Formatter.formatFileSize(context, limit));