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

Merge "Fix data usage" into nyc-dev am: 0ee49040b3

Browse Source 
am: d200425210

* commit 'd200425210debaac72c03e7d216508084a91fd25':
  Fix data usage
This commit is contained in:
Jason Monk
2016-03-15 15:45:42 +00:00
committed by android-build-merger
parent 09f362c08c d200425210
commit cec2040d85
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ public class ChartDataUsagePreference extends Preference {
int top = getTop();
chart.clearPaths();
chart.configureGraph((int) (mEnd - mStart), top, false, false);
chart.configureGraph(toInt(mEnd - mStart), top, false, false);
calcPoints(chart);
chart.setBottomLabels(new CharSequence[] {
Utils.formatDateRange(getContext(), mStart, mStart),
@@ -96,7 +96,6 @@ public class ChartDataUsagePreference extends Preference {
SparseIntArray points = new SparseIntArray();
NetworkStatsHistory.Entry entry = null;
long lastTime = -1;
long totalData = 0;
final int start = mNetwork.getIndexAfter(mStart);
@@ -113,23 +112,19 @@ public class ChartDataUsagePreference extends Preference {
// increment by current bucket total
totalData += entry.rxBytes + entry.txBytes;
if (lastTime != startTime) {
if (points.size() > 1) {
chart.addPath(points);
}
points.clear();
}
points.put((int) (startTime - mStart + 1), (int) (totalData / RESOLUTION));
points.put((int) (endTime - mStart), (int) (totalData / RESOLUTION));
lastTime = endTime;
points.put(toInt(startTime - mStart + 1), (int) (totalData / RESOLUTION));
points.put(toInt(endTime - mStart), (int) (totalData / RESOLUTION));
}
if (points.size() > 1) {
chart.addPath(points);
}
}
private int toInt(long l) {
// Don't need that much resolution on these times.
return (int) (l / (1000 * 60));
}
private void bindNetworkPolicy(UsageView chart, NetworkPolicy policy, int top) {
CharSequence[] labels = new CharSequence[3];
int middleVisibility = 0;