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

Improvements on "App data usage" screen.

Browse Source 
- Don't disply whitelist toggle if app is blacklisted.
- Handle scenario where app don't have any quota usage.

BUG: 27481520

Change-Id: I0147025d6bba2d6deeda109aeebb296607550bd8
This commit is contained in:
Felipe Leme
2016-04-13 14:54:59 -07:00
parent 1e890cb8f7
commit 4133fc1cb1
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,9 +226,14 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
mRestrictBackground.setChecked(!getAppRestrictBackground()); mRestrictBackground.setChecked(!getAppRestrictBackground());
} }
if (mUnrestrictedData != null) { if (mUnrestrictedData != null) {
if (getAppRestrictBackground()) {
mUnrestrictedData.setVisible(false);
} else {
mUnrestrictedData.setVisible(true);
mUnrestrictedData.setChecked(mDataSaverBackend.isWhitelisted(mAppItem.key)); mUnrestrictedData.setChecked(mDataSaverBackend.isWhitelisted(mAppItem.key));
} }
} }
}
private void addUid(int uid) { private void addUid(int uid) {
String[] packages = getPackageManager().getPackagesForUid(uid); String[] packages = getPackageManager().getPackagesForUid(uid);
@@ -240,18 +245,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);
final Context context = getContext(); } else {
mCycle.setVisible(true);
final long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
NetworkStatsHistory.Entry entry = null; NetworkStatsHistory.Entry entry = null;
entry = mChartData.detailDefault.getValues(mStart, mEnd, now, entry); entry = mChartData.detailDefault.getValues(mStart, mEnd, now, entry);
final long backgroundBytes = entry.rxBytes + entry.txBytes; backgroundBytes = entry.rxBytes + entry.txBytes;
entry = mChartData.detailForeground.getValues(mStart, mEnd, now, entry); entry = mChartData.detailForeground.getValues(mStart, mEnd, now, entry);
final long foregroundBytes = entry.rxBytes + entry.txBytes; 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));
@@ -268,6 +276,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