Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-02-28 01:28:23 +00:00
committed by Android (Google) Code Review
2 changed files with 26 additions and 8 deletions

View File

@@ -90,8 +90,10 @@ public class DataUsageList extends DataUsageBaseFragment
private static final String KEY_APP = "app";
private static final String KEY_FIELDS = "fields";
private static final int LOADER_CHART_DATA = 2;
private static final int LOADER_SUMMARY = 3;
@VisibleForTesting
static final int LOADER_CHART_DATA = 2;
@VisibleForTesting
static final int LOADER_SUMMARY = 3;
@VisibleForTesting
MobileDataEnabledListener mDataStateListener;
@@ -188,6 +190,13 @@ public class DataUsageList extends DataUsageBaseFragment
public void onResume() {
super.onResume();
mDataStateListener.start(mSubId);
// kick off loader for network history
// TODO: consider chaining two loaders together instead of reloading
// network history when showing app detail.
getLoaderManager().restartLoader(LOADER_CHART_DATA,
buildArgs(mTemplate), mNetworkCycleDataCallbacks);
updateBody();
}
@@ -195,6 +204,9 @@ public class DataUsageList extends DataUsageBaseFragment
public void onPause() {
super.onPause();
mDataStateListener.stop();
getLoaderManager().destroyLoader(LOADER_CHART_DATA);
getLoaderManager().destroyLoader(LOADER_SUMMARY);
}
@Override
@@ -246,12 +258,6 @@ public class DataUsageList extends DataUsageBaseFragment
final Context context = getActivity();
// kick off loader for network history
// TODO: consider chaining two loaders together instead of reloading
// network history when showing app detail.
getLoaderManager().restartLoader(LOADER_CHART_DATA,
buildArgs(mTemplate), mNetworkCycleDataCallbacks);
// detail mode can change visible menus, invalidate
getActivity().invalidateOptionsMenu();