Merge "Add icons to the main static storage setting prefs."

src/com/android/settings/deviceinfo/StorageProfileFragment.java

@@ -73,6 +73,7 @@ public class StorageProfileFragment extends DashboardFragment
 
         mPreferenceController.setVolume(mVolume);
         mUserId = args.getInt(USER_ID_EXTRA, UserHandle.myUserId());
+        // TODO(b/36224168): Use the user id to appropriately badge the preferences.
         mPreferenceController.setUserId(mUserId);
     }
 
@@ -137,6 +138,7 @@ public class StorageProfileFragment extends DashboardFragment
             return null;
         }
 
+        // TODO(b/35927909): Attribute app sizes better than zeroing out for profiles.
         result.gamesSize = 0;
         result.musicAppsSize = 0;
         result.otherAppsSize = 0;

src/com/android/settings/deviceinfo/storage/SecondaryUserController.java

@@ -33,7 +33,6 @@ import com.android.settings.deviceinfo.StorageItemPreference;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * SecondaryUserController controls the preferences on the Storage screen which had to do with
  * secondary users.
@@ -109,6 +108,9 @@ public class SecondaryUserController extends PreferenceController implements
             if (mSize != SIZE_NOT_SET) {
                 mStoragePreference.setStorageSize(mSize, mTotalSizeBytes);
             }
+
+            // TODO(b/36252572): Set the user icon appropriately here.
+
             group.setVisible(true);
             group.addPreference(mStoragePreference);
         }

src/com/android/settings/deviceinfo/storage/UserProfileController.java

@@ -66,6 +66,7 @@ public class UserProfileController extends PreferenceController implements
         mStoragePreference.setOrder(mPreferenceOrder);
         mStoragePreference.setKey(PREFERENCE_KEY_BASE + mUser.id);
         mStoragePreference.setTitle(mUser.name);
+        // TODO(b/36252572): Set user icon here.
         screen.addPreference(mStoragePreference);
     }