From ccf4fa052a8f403395923827e6f9f8c12988602c Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Fri, 18 Nov 2022 17:33:10 +0800 Subject: [PATCH] Should not show loading animation after size loading complete SettingsPreferenceFragment#setLoading(boolean loading, boolean animate) shows loading animation when 'animate' parameter is true. This change sets 'animate' parameter false to fix this issue. Bug: 254003456 Test: manual visual Settings -> Storage -> Free up space -> back then see if loading animation shows. Change-Id: Ic804bcf950a9c57297ccefd6e942edea0b792a3b --- .../android/settings/deviceinfo/StorageCategoryFragment.java | 5 +---- .../settings/deviceinfo/StorageDashboardFragment.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/deviceinfo/StorageCategoryFragment.java b/src/com/android/settings/deviceinfo/StorageCategoryFragment.java index 31b73bc156d..d1c8029549a 100644 --- a/src/com/android/settings/deviceinfo/StorageCategoryFragment.java +++ b/src/com/android/settings/deviceinfo/StorageCategoryFragment.java @@ -26,7 +26,6 @@ import android.os.Bundle; import android.os.UserManager; import android.os.storage.StorageManager; import android.util.SparseArray; -import android.view.View; import androidx.annotation.VisibleForTesting; import androidx.loader.app.LoaderManager; @@ -210,9 +209,7 @@ public class StorageCategoryFragment extends DashboardFragment return; } - if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) { - setLoading(false /* loading */, true /* animate */); - } + setLoading(false /* loading */, false /* animate */); final long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes; mPreferenceController.setVolume(mSelectedStorageEntry.getVolumeInfo()); diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 368ba9157f3..f31f2be0049 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -385,7 +385,7 @@ public class StorageDashboardFragment extends DashboardFragment return; } - setLoading(false /* loading */, true /* animate */); + setLoading(false /* loading */, false /* animate */); final long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes; mPreferenceController.setVolume(mSelectedStorageEntry.getVolumeInfo());