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

Merge "Hide empty data usage cycles." into mnc-dr-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-10-20 17:21:52 +00:00
committed by Android (Google) Code Review
parent 29b0ea2dbf 02551ecd2e
commit 2fcbdb7bb6
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/DataUsageSummary.java
View File

@@ -1166,6 +1166,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
mCycleAdapter.clear(); mCycleAdapter.clear();
final Context context = mCycleSpinner.getContext(); final Context context = mCycleSpinner.getContext();
NetworkStatsHistory.Entry entry = null;
long historyStart = Long.MAX_VALUE; long historyStart = Long.MAX_VALUE;
long historyEnd = Long.MIN_VALUE; long historyEnd = Long.MIN_VALUE;
@@ -1188,10 +1189,21 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
final long cycleStart = computeLastCycleBoundary(cycleEnd, policy); final long cycleStart = computeLastCycleBoundary(cycleEnd, policy);
Log.d(TAG, "generating cs=" + cycleStart + " to ce=" + cycleEnd + " waiting for hs=" Log.d(TAG, "generating cs=" + cycleStart + " to ce=" + cycleEnd + " waiting for hs="
+ historyStart); + historyStart);
final boolean includeCycle;
if (mChartData != null) {
entry = mChartData.network.getValues(cycleStart, cycleEnd, entry);
includeCycle = (entry.rxBytes + entry.txBytes) > 0;
} else {
includeCycle = true;
}
if (includeCycle) {
mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
cycleEnd = cycleStart;
hasCycles = true; hasCycles = true;
} }
cycleEnd = cycleStart;
}
// one last cycle entry to modify policy cycle day // one last cycle entry to modify policy cycle day
mCycleAdapter.setChangePossible(isNetworkPolicyModifiable(policy)); mCycleAdapter.setChangePossible(isNetworkPolicyModifiable(policy));
@@ -1202,7 +1214,18 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
long cycleEnd = historyEnd; long cycleEnd = historyEnd;
while (cycleEnd > historyStart) { while (cycleEnd > historyStart) {
final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4); final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4);
final boolean includeCycle;
if (mChartData != null) {
entry = mChartData.network.getValues(cycleStart, cycleEnd, entry);
includeCycle = (entry.rxBytes + entry.txBytes) > 0;
} else {
includeCycle = true;
}
if (includeCycle) {
mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd)); mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
}
cycleEnd = cycleStart; cycleEnd = cycleStart;
} }