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

Merge "Hide filter spinner when data is loading." into qt-dev

Browse Source 
am: 03c461b3ee

Change-Id: I966e020c6952322ec8c3967e363a4f6f2e72cd44
This commit is contained in:
Yi-Ling Chuang
2019-04-16 12:07:59 -07:00
committed by android-build-merger
parent ca374718ca 03c461b3ee
commit 95a850bc64
2 changed files with 82 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,22 +99,23 @@ public class DataUsageList extends DataUsageBaseFragment {
}
};
private ChartDataUsagePreference mChart;
private TelephonyManager mTelephonyManager;
@VisibleForTesting
NetworkTemplate mTemplate;
@VisibleForTesting
int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@VisibleForTesting
int mNetworkType;
@VisibleForTesting
Spinner mCycleSpinner;
@VisibleForTesting
LoadingViewController mLoadingViewController;
private ChartDataUsagePreference mChart;
private TelephonyManager mTelephonyManager;
private List<NetworkCycleChartData> mCycleData;
private ArrayList<Long> mCycles;
private LoadingViewController mLoadingViewController;
private UidDetailProvider mUidDetailProvider;
private CycleAdapter mCycleAdapter;
private Spinner mCycleSpinner;
private Preference mUsageAmount;
private PreferenceGroup mApps;
private View mHeader;
@@ -158,6 +159,7 @@ public class DataUsageList extends DataUsageBaseFragment {
.launch();
});
mCycleSpinner = mHeader.findViewById(R.id.filter_spinner);
mCycleSpinner.setVisibility(View.GONE);
mCycleAdapter = new CycleAdapter(mCycleSpinner.getContext(), new SpinnerInterface() {
@Override
public void setAdapter(CycleAdapter cycleAdapter) {
@@ -276,7 +278,8 @@ public class DataUsageList extends DataUsageBaseFragment {
* Update chart sweeps and cycle list to reflect {@link NetworkPolicy} for
* current {@link #mTemplate}.
*/
private void updatePolicy() {
@VisibleForTesting
void updatePolicy() {
final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate);
final View configureButton = mHeader.findViewById(R.id.filter_settings);
//SUB SELECT
@@ -486,7 +489,8 @@ public class DataUsageList extends DataUsageBaseFragment {
}
};
private final LoaderCallbacks<List<NetworkCycleChartData>> mNetworkCycleDataCallbacks =
@VisibleForTesting
final LoaderCallbacks<List<NetworkCycleChartData>> mNetworkCycleDataCallbacks =
new LoaderCallbacks<List<NetworkCycleChartData>>() {
@Override
public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {
@@ -503,6 +507,7 @@ public class DataUsageList extends DataUsageBaseFragment {
mCycleData = data;
// calculate policy cycles based on available data
updatePolicy();
mCycleSpinner.setVisibility(View.VISIBLE);
}
@Override