PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of a04bf12 to master

Browse Source 
Change-Id: Ie8b93666d98832af510e76ec50af964e2460743b
This commit is contained in:
Matthew Fritze
2016-09-14 09:30:01 -07:00
parent 14e9535fc8 a04bf124e6
commit 932bb2ee02
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.INetworkStatsSession; import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.os.Bundle; 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 static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
private DataUsageController mDataUsageController; private DataUsageController mDataUsageController;
private DataUsageInfoController mDataInfoControler; private DataUsageInfoController mDataInfoController;
private SummaryPreference mSummaryPreference; private SummaryPreference mSummaryPreference;
private Preference mLimitPreference; private Preference mLimitPreference;
private NetworkTemplate mDefaultTemplate; private NetworkTemplate mDefaultTemplate;
@@ -83,7 +82,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
boolean hasMobileData = hasMobileData(getContext()); boolean hasMobileData = hasMobileData(getContext());
mDataUsageController = new DataUsageController(getContext()); mDataUsageController = new DataUsageController(getContext());
mDataInfoControler = new DataUsageInfoController(); mDataInfoController = new DataUsageInfoController();
addPreferencesFromResource(R.xml.data_usage); addPreferencesFromResource(R.xml.data_usage);
int defaultSubId = getDefaultSubscriptionId(getContext()); int defaultSubId = getDefaultSubscriptionId(getContext());
@@ -227,13 +226,13 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo( DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
mDefaultTemplate); mDefaultTemplate);
Context context = getContext(); Context context = getContext();
mDataInfoControler.updateDataLimit(info, mDataInfoController.updateDataLimit(info,
services.mPolicyEditor.getPolicy(mDefaultTemplate)); services.mPolicyEditor.getPolicy(mDefaultTemplate));
if (mSummaryPreference != null) { if (mSummaryPreference != null) {
mSummaryPreference.setTitle( mSummaryPreference.setTitle(
formatTitle(context, getString(mDataUsageTemplate), info.usageLevel)); formatTitle(context, getString(mDataUsageTemplate), info.usageLevel));
long limit = mDataInfoControler.getSummaryLimit(info); long limit = mDataInfoController.getSummaryLimit(info);
mSummaryPreference.setSummary(info.period); mSummaryPreference.setSummary(info.period);
mSummaryPreference.setLabels(Formatter.formatFileSize(context, 0), mSummaryPreference.setLabels(Formatter.formatFileSize(context, 0),
Formatter.formatFileSize(context, limit)); Formatter.formatFileSize(context, limit));