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

Use the loader to get usage data for each billing cycle.

Browse Source 
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I4242687b404a290e81d43c505b9afbd2a07aafdb
This commit is contained in:
Doris Ling
2018-09-20 17:10:55 -07:00
parent 7686eb4f85
commit 654adf9c9e
4 changed files with 142 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,9 +25,11 @@ import android.widget.ArrayAdapter;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.NetworkCycleData;
import java.time.ZonedDateTime;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
@@ -68,7 +70,8 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
* {@link NetworkStatsHistory} data. Always selects the newest item,
* updating the inspection range on chartData.
*/
public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
@Deprecated
public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
// stash away currently selected cycle to try restoring below
final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
mSpinner.getSelectedItem();
@@ -149,6 +152,37 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
return true;
}
/**
* Rebuild list based on network data. Always selects the newest item,
* updating the inspection range on chartData.
*/
public boolean updateCycleList(List<NetworkCycleData> cycleData) {
// stash away currently selected cycle to try restoring below
final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
mSpinner.getSelectedItem();
clear();
final Context context = getContext();
for (NetworkCycleData data : cycleData) {
add(new CycleAdapter.CycleItem(context, data.startTime, data.endTime));
}
// force pick the current cycle (first item)
if (getCount() > 0) {
final int position = findNearestPosition(previousItem);
mSpinner.setSelection(position);
// only force-update cycle when changed; skipping preserves any
// user-defined inspection region.
final CycleAdapter.CycleItem selectedItem = getItem(position);
if (!Objects.equals(selectedItem, previousItem)) {
mListener.onItemSelected(null, null, position, 0);
return false;
}
}
return true;
}
/**
* List item that reflects a specific data usage cycle.
*/