Merge "Fix a bug where storage settings flickers." into oc-dev am: 1da7123930

am: 90c963b1fa

Change-Id: I46fa3abdf3843b442b5ff484e74ae91d41eb68bd

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