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

Merge "Improvements on "App data usage" screen." into nyc-dev

Browse Source
This commit is contained in:
Felipe Leme
2016-04-14 15:55:17 +00:00
committed by Android (Google) Code Review
parent 452e371aa1 4133fc1cb1
commit 2b131e58a7
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -236,7 +236,12 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
mRestrictBackground.setChecked(!getAppRestrictBackground()); mRestrictBackground.setChecked(!getAppRestrictBackground());
} }
if (mUnrestrictedData != null) { if (mUnrestrictedData != null) {
mUnrestrictedData.setChecked(mDataSaverBackend.isWhitelisted(mAppItem.key)); if (getAppRestrictBackground()) {
mUnrestrictedData.setVisible(false);
} else {
mUnrestrictedData.setVisible(true);
mUnrestrictedData.setChecked(mDataSaverBackend.isWhitelisted(mAppItem.key));
}
} }
} }
@@ -250,18 +255,21 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
} }
private void bindData() { private void bindData() {
final long backgroundBytes, foregroundBytes;
if (mChartData == null || mStart == 0) { if (mChartData == null || mStart == 0) {
return; backgroundBytes = foregroundBytes = 0;
mCycle.setVisible(false);
} else {
mCycle.setVisible(true);
final long now = System.currentTimeMillis();
NetworkStatsHistory.Entry entry = null;
entry = mChartData.detailDefault.getValues(mStart, mEnd, now, entry);
backgroundBytes = entry.rxBytes + entry.txBytes;
entry = mChartData.detailForeground.getValues(mStart, mEnd, now, entry);
foregroundBytes = entry.rxBytes + entry.txBytes;
} }
final Context context = getContext();
final long now = System.currentTimeMillis();
NetworkStatsHistory.Entry entry = null;
entry = mChartData.detailDefault.getValues(mStart, mEnd, now, entry);
final long backgroundBytes = entry.rxBytes + entry.txBytes;
entry = mChartData.detailForeground.getValues(mStart, mEnd, now, entry);
final long foregroundBytes = entry.rxBytes + entry.txBytes;
final long totalBytes = backgroundBytes + foregroundBytes; final long totalBytes = backgroundBytes + foregroundBytes;
final Context context = getContext();
mTotalUsage.setSummary(Formatter.formatFileSize(context, totalBytes)); mTotalUsage.setSummary(Formatter.formatFileSize(context, totalBytes));
mForegroundUsage.setSummary(Formatter.formatFileSize(context, foregroundBytes)); mForegroundUsage.setSummary(Formatter.formatFileSize(context, foregroundBytes));
@@ -278,6 +286,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
final int uid = mAppItem.key; final int uid = mAppItem.key;
services.mPolicyManager.setUidPolicy( services.mPolicyManager.setUidPolicy(
uid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE); uid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
updatePrefs(); // TODO: should have been notified by NPMS instead
} }
@Override @Override