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

Merge "Fix storage page slow loading issue"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-09 02:46:02 +00:00
committed by Android (Google) Code Review
parent fa9e685fff 47dcff42df
commit 7be752269b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

@@ -66,7 +66,6 @@ public class StorageDashboardFragment extends DashboardFragment
private static final int STORAGE_JOB_ID = 0; private static final int STORAGE_JOB_ID = 0;
private static final int ICON_JOB_ID = 1; private static final int ICON_JOB_ID = 1;
private static final int VOLUME_SIZE_JOB_ID = 2; private static final int VOLUME_SIZE_JOB_ID = 2;
private static final int OPTIONS_MENU_MIGRATE_DATA = 100;
private VolumeInfo mVolume; private VolumeInfo mVolume;
private PrivateStorageInfo mStorageInfo; private PrivateStorageInfo mStorageInfo;
@@ -139,6 +138,7 @@ public class StorageDashboardFragment extends DashboardFragment
} }
private void onReceivedSizes() { private void onReceivedSizes() {
boolean stopLoading = false;
if (mStorageInfo != null) { if (mStorageInfo != null) {
long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes; long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes;
mSummaryController.updateBytes(privateUsedBytes, mStorageInfo.totalBytes); mSummaryController.updateBytes(privateUsedBytes, mStorageInfo.totalBytes);
@@ -152,18 +152,21 @@ public class StorageDashboardFragment extends DashboardFragment
userController.setTotalSize(mStorageInfo.totalBytes); userController.setTotalSize(mStorageInfo.totalBytes);
} }
} }
stopLoading = true;
} }
if (mAppsResult == null) { if (mAppsResult != null) {
return; mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
stopLoading = true;
} }
mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
// setLoading always causes a flicker, so let's avoid doing it. // setLoading always causes a flicker, so let's avoid doing it.
if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) { if (stopLoading) {
setLoading(false, true); if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) {
setLoading(false, true);
}
} }
} }