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

Rename NetworkCycleData to NetworkCycleChartData.

Browse Source 
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I47c1bbe09f11f4d0bd0d41c1f9d4c3e5a3773f05
This commit is contained in:
Doris Ling
2018-09-27 17:41:15 -07:00
parent 5d397194ec
commit 4a99c36572
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import android.text.format.Formatter;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
import android.util.Pair;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -35,6 +34,7 @@ import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags; import com.android.settings.core.FeatureFlags;
import com.android.settings.widget.UsageView; import com.android.settings.widget.UsageView;
import com.android.settingslib.net.NetworkCycleChartData;
import com.android.settingslib.net.NetworkCycleData; import com.android.settingslib.net.NetworkCycleData;
import java.util.List; import java.util.List;
@@ -53,7 +53,7 @@ public class ChartDataUsagePreference extends Preference {
private long mEnd; private long mEnd;
@Deprecated @Deprecated
private NetworkStatsHistory mNetwork; private NetworkStatsHistory mNetwork;
private NetworkCycleData mNetworkCycleData; private NetworkCycleChartData mNetworkCycleChartData;
private int mSecondaryColor; private int mSecondaryColor;
private int mSeriesColor; private int mSeriesColor;
@@ -70,7 +70,7 @@ public class ChartDataUsagePreference extends Preference {
super.onBindViewHolder(holder); super.onBindViewHolder(holder);
final UsageView chart = (UsageView) holder.findViewById(R.id.data_usage); final UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) { if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
if (mNetworkCycleData == null) { if (mNetworkCycleChartData == null) {
return; return;
} }
} else { } else {
@@ -83,7 +83,7 @@ public class ChartDataUsagePreference extends Preference {
chart.clearPaths(); chart.clearPaths();
chart.configureGraph(toInt(mEnd - mStart), top); chart.configureGraph(toInt(mEnd - mStart), top);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) { if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
calcPoints(chart, mNetworkCycleData.usageBuckets); calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());
} else { } else {
calcPoints(chart); calcPoints(chart);
} }
@@ -98,7 +98,7 @@ public class ChartDataUsagePreference extends Preference {
public int getTop() { public int getTop() {
long totalData = 0; long totalData = 0;
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) { if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
totalData = mNetworkCycleData.totalUsage; totalData = mNetworkCycleChartData.getTotalUsage();
} else { } else {
NetworkStatsHistory.Entry entry = null; NetworkStatsHistory.Entry entry = null;
final int start = mNetwork.getIndexBefore(mStart); final int start = mNetwork.getIndexBefore(mStart);
@@ -158,14 +158,14 @@ public class ChartDataUsagePreference extends Preference {
long totalData = 0; long totalData = 0;
for (NetworkCycleData data : usageSummary) { for (NetworkCycleData data : usageSummary) {
final long startTime = data.startTime; final long startTime = data.getStartTime();
final long endTime = data.endTime; final long endTime = data.getEndTime();
// increment by current bucket total // increment by current bucket total
totalData += data.totalUsage; totalData += data.getTotalUsage();
if (points.size() == 1) { if (points.size() == 1) {
points.put(toInt(data.startTime - mStart) - 1, -1); points.put(toInt(startTime - mStart) - 1, -1);
} }
points.put(toInt(startTime - mStart + 1), (int) (totalData / RESOLUTION)); points.put(toInt(startTime - mStart + 1), (int) (totalData / RESOLUTION));
points.put(toInt(endTime - mStart), (int) (totalData / RESOLUTION)); points.put(toInt(endTime - mStart), (int) (totalData / RESOLUTION));
@@ -241,10 +241,10 @@ public class ChartDataUsagePreference extends Preference {
notifyChanged(); notifyChanged();
} }
public void setNetworkCycleData(NetworkCycleData data) { public void setNetworkCycleData(NetworkCycleChartData data) {
mNetworkCycleData = data; mNetworkCycleChartData = data;
mStart = data.startTime; mStart = data.getStartTime();
mEnd = data.endTime; mEnd = data.getEndTime();
notifyChanged(); notifyChanged();
} }

4
src/com/android/settings/datausage/CycleAdapter.java
View File

@@ -156,7 +156,7 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
* Rebuild list based on network data. Always selects the newest item, * Rebuild list based on network data. Always selects the newest item,
* updating the inspection range on chartData. * updating the inspection range on chartData.
*/ */
public boolean updateCycleList(List<NetworkCycleData> cycleData) { public boolean updateCycleList(List<? extends NetworkCycleData> cycleData) {
// stash away currently selected cycle to try restoring below // stash away currently selected cycle to try restoring below
final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem) final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
mSpinner.getSelectedItem(); mSpinner.getSelectedItem();
@@ -164,7 +164,7 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
final Context context = getContext(); final Context context = getContext();
for (NetworkCycleData data : cycleData) { for (NetworkCycleData data : cycleData) {
add(new CycleAdapter.CycleItem(context, data.startTime, data.endTime)); add(new CycleAdapter.CycleItem(context, data.getStartTime(), data.getEndTime()));
} }
// force pick the current cycle (first item) // force pick the current cycle (first item)

22
src/com/android/settings/datausage/DataUsageListV2.java
View File

@@ -61,8 +61,8 @@ import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
import com.android.settings.widget.LoadingViewController; import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.AppItem; import com.android.settingslib.AppItem;
import com.android.settingslib.net.ChartDataLoaderCompat; import com.android.settingslib.net.ChartDataLoaderCompat;
import com.android.settingslib.net.NetworkCycleDataLoader; import com.android.settingslib.net.NetworkCycleChartDataLoader;
import com.android.settingslib.net.NetworkCycleData; import com.android.settingslib.net.NetworkCycleChartData;
import com.android.settingslib.net.NetworkStatsSummaryLoader; import com.android.settingslib.net.NetworkStatsSummaryLoader;
import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.net.UidDetailProvider;
@@ -107,7 +107,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@VisibleForTesting @VisibleForTesting
int mNetworkType; int mNetworkType;
private List<NetworkCycleData> mCycleData; private List<NetworkCycleChartData> mCycleData;
private LoadingViewController mLoadingViewController; private LoadingViewController mLoadingViewController;
private UidDetailProvider mUidDetailProvider; private UidDetailProvider mUidDetailProvider;
@@ -322,7 +322,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
mNetworkStatsDetailCallbacks); mNetworkStatsDetailCallbacks);
final long totalBytes = mCycleData != null final long totalBytes = mCycleData != null
? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).totalUsage : 0; ? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).getTotalUsage() : 0;
final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(getActivity(), totalBytes); final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(getActivity(), totalBytes);
mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase)); mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase));
} }
@@ -485,11 +485,11 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
} }
}; };
private final LoaderCallbacks<List<NetworkCycleData>> mNetworkCycleDataCallbacks = private final LoaderCallbacks<List<NetworkCycleChartData>> mNetworkCycleDataCallbacks =
new LoaderCallbacks<List<NetworkCycleData>>() { new LoaderCallbacks<List<NetworkCycleChartData>>() {
@Override @Override
public Loader<List<NetworkCycleData>> onCreateLoader(int id, Bundle args) { public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {
return new NetworkCycleDataLoader.Builder(getContext()) return NetworkCycleChartDataLoader.builder(getContext())
.setNetworkPolicy(services.mPolicyEditor.getPolicy(mTemplate)) .setNetworkPolicy(services.mPolicyEditor.getPolicy(mTemplate))
.setNetworkType(mNetworkType) .setNetworkType(mNetworkType)
.setNetworkTemplate(mTemplate) .setNetworkTemplate(mTemplate)
@@ -498,8 +498,8 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
} }
@Override @Override
public void onLoadFinished(Loader<List<NetworkCycleData>> loader, public void onLoadFinished(Loader<List<NetworkCycleChartData>> loader,
List<NetworkCycleData> data) { List<NetworkCycleChartData> data) {
mLoadingViewController.showContent(false /* animate */); mLoadingViewController.showContent(false /* animate */);
mCycleData = data; mCycleData = data;
// calculate policy cycles based on available data // calculate policy cycles based on available data
@@ -507,7 +507,7 @@ public class DataUsageListV2 extends DataUsageBaseFragment {
} }
@Override @Override
public void onLoaderReset(Loader<List<NetworkCycleData>> loader) { public void onLoaderReset(Loader<List<NetworkCycleChartData>> loader) {
mCycleData = null; mCycleData = null;
} }
}; };