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

Update data usage graph to use new graph ui

Browse Source 
Bug: 27278313
Change-Id: Ia9e8598dcb970540877f7dac7061cfc55ed99d4d
This commit is contained in:
Jason Monk
2016-03-08 12:59:03 -05:00
parent 222be28d13
commit 9dc9a0ebb3
5 changed files with 168 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,18 +15,31 @@
package com.android.settings.datausage;
import android.content.Context;
import android.graphics.Color;
import android.content.res.TypedArray;
import android.net.NetworkPolicy;
import android.net.NetworkStatsHistory;
import android.net.TrafficStats;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
import android.util.SparseIntArray;
import com.android.settings.R;
import com.android.settings.widget.ChartDataUsageView;
import com.android.settings.widget.ChartNetworkSeriesView;
import com.android.settings.Utils;
import com.android.settingslib.graph.UsageView;
public class ChartDataUsagePreference extends Preference {
// The resolution we show on the graph so that we can squash things down to ints.
// Set to half a meg for now.
private static final long RESOLUTION = TrafficStats.MB_IN_BYTES / 2;
private final int mWarningColor;
private final int mLimitColor;
private NetworkPolicy mPolicy;
private long mStart;
private long mEnd;
@@ -36,21 +49,123 @@ public class ChartDataUsagePreference extends Preference {
public ChartDataUsagePreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.data_usage_chart);
setSelectable(false);
// TODO: Resource.
mLimitColor = 0xfff4511e;
TypedArray a = context.getTheme().obtainStyledAttributes(
new int[]{android.R.attr.textColorSecondary});
mWarningColor = a.getColor(0, 0);
setLayoutResource(R.layout.data_usage_graph);
}
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
ChartDataUsageView chart = (ChartDataUsageView) holder.itemView;
chart.setVisibleRange(mStart, mEnd);
chart.bindNetworkPolicy(mPolicy);
chart.bindNetworkStats(mNetwork);
ChartNetworkSeriesView series = (ChartNetworkSeriesView) holder.findViewById(R.id.series);
series.setChartColor(Color.BLACK, mSeriesColor, mSecondaryColor);
UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);
if (mNetwork == null) return;
int top = getTop();
chart.clearPaths();
chart.configureGraph((int) (mEnd - mStart), top, false, false);
calcPoints(chart);
chart.setBottomLabels(new CharSequence[] {
Utils.formatDateRange(getContext(), mStart, mStart),
Utils.formatDateRange(getContext(), mEnd, mEnd),
});
bindNetworkPolicy(chart, mPolicy, top);
}
public void bindNetworkPolicy(NetworkPolicy policy) {
public int getTop() {
NetworkStatsHistory.Entry entry = null;
long totalData = 0;
final int start = mNetwork.getIndexBefore(mStart);
final int end = mNetwork.getIndexAfter(mEnd);
for (int i = start; i <= end; i++) {
entry = mNetwork.getValues(i, entry);
// increment by current bucket total
totalData += entry.rxBytes + entry.txBytes;
}
long policyMax = mPolicy != null ? Math.max(mPolicy.limitBytes, mPolicy.warningBytes) : 0;
return (int) (Math.max(totalData, policyMax) / RESOLUTION);
}
private void calcPoints(UsageView chart) {
SparseIntArray points = new SparseIntArray();
NetworkStatsHistory.Entry entry = null;
long lastTime = -1;
long totalData = 0;
final int start = mNetwork.getIndexAfter(mStart);
final int end = mNetwork.getIndexAfter(mEnd);
if (start < 0) return;
points.put(0, 0);
for (int i = start; i <= end; i++) {
entry = mNetwork.getValues(i, entry);
final long startTime = entry.bucketStart;
final long endTime = startTime + entry.bucketDuration;
// 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;
}
if (points.size() > 1) {
chart.addPath(points);
}
}
private void bindNetworkPolicy(UsageView chart, NetworkPolicy policy, int top) {
CharSequence[] labels = new CharSequence[3];
int middleVisibility = 0;
int topVisibility = 0;
if (policy == null) {
return;
}
if (policy.limitBytes != NetworkPolicy.LIMIT_DISABLED) {
topVisibility = mLimitColor;
labels[2] = getLabel(policy.limitBytes, R.string.data_usage_sweep_limit, mLimitColor);
}
if (policy.warningBytes != NetworkPolicy.WARNING_DISABLED) {
chart.setDividerLoc((int) (policy.warningBytes / RESOLUTION));
float weight = policy.warningBytes / RESOLUTION / (float) top;
float above = 1 - weight;
chart.setSideLabelWeights(above, weight);
middleVisibility = mWarningColor;
labels[1] = getLabel(policy.warningBytes, R.string.data_usage_sweep_warning,
mWarningColor);
}
chart.setSideLabels(labels);
chart.setDividerColors(middleVisibility, topVisibility);
}
private CharSequence getLabel(long bytes, int str, int mLimitColor) {
Formatter.BytesResult result = Formatter.formatBytes(getContext().getResources(),
bytes, Formatter.FLAG_SHORTER);
CharSequence label = TextUtils.expandTemplate(getContext().getText(str),
result.value, result.units);
return new SpannableStringBuilder().append(label, new ForegroundColorSpan(mLimitColor), 0);
}
public void setNetworkPolicy(NetworkPolicy policy) {
mPolicy = policy;
notifyChanged();
}
@@ -69,7 +184,7 @@ public class ChartDataUsagePreference extends Preference {
return mEnd;
}
public void bindNetworkStats(NetworkStatsHistory network) {
public void setNetworkStats(NetworkStatsHistory network) {
mNetwork = network;
notifyChanged();
}