Merge "Fix a bug where storage settings flickers." into oc-dev

am: 1da7123930 Change-Id: I1cfe2b00a37e26d0e4f7c6806fadb601c5fdb617
2017-05-16 17:07:34 +00:00
parent 183aed6dd6 1da7123930
commit 90c963b1fa
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -133,7 +133,11 @@ public class StorageDashboardFragment extends DashboardFragment

        mPreferenceController.onLoadFinished(mAppsResult.get(UserHandle.myUserId()));
        updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
-        setLoading(false, true);
+
+        // setLoading always causes a flicker, so let's avoid doing it.
+        if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) {
+            setLoading(false, true);
+        }
    }

    @Override