Download home v2: Show storage used by downloads.

This CL changes the storage string to [storage used by download] of
[total disk size].

Bug: 892328
Change-Id: I6516c89e4f6bf71101c56b43171375a037cc36bf
Reviewed-on: https://chromium-review.googlesource.com/c/1277917
Commit-Queue: Xing Liu <xingliu@chromium.org>
Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599703}

chrome/android/java/src/org/chromium/chrome/browser/download/home/storage/StorageSummaryProvider.java

@@ -14,7 +14,9 @@ import org.chromium.chrome.browser.download.DirectoryOption;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.download.home.filter.OfflineItemFilterObserver;
 import org.chromium.chrome.browser.download.home.filter.OfflineItemFilterSource;
+import org.chromium.chrome.browser.download.ui.DownloadHistoryAdapter;
 import org.chromium.components.offline_items_collection.OfflineItem;
+import org.chromium.components.offline_items_collection.OfflineItemState;
 
 import java.io.File;
 import java.util.Collection;
@@ -31,8 +33,12 @@ public class StorageSummaryProvider implements OfflineItemFilterObserver {
     private final Context mContext;
     private final Delegate mDelegate;
 
+    // Contains total space and available space of the file system.
     private DirectoryOption mDirectoryOption;
 
+    // The total size in bytes used by downloads.
+    private long mTotalDownloadSize;
+
     /**
      * Asynchronous task to query the default download directory option on primary storage.
      * Pass one String parameter as the name of the directory option.
@@ -55,25 +61,47 @@ public class StorageSummaryProvider implements OfflineItemFilterObserver {
         mContext = context;
         mDelegate = delegate;
 
-        if (filterSource != null) filterSource.addObserver(this);
-        computeStorage();
+        if (filterSource != null) {
+            filterSource.addObserver(this);
+            mTotalDownloadSize = getTotalSize(filterSource.getItems());
+        }
+
+        computeTotalStorage();
+    }
+
+    /**
+     * Sets the total size used by downloads. Used to support legacy download home UI, see
+     * {@link DownloadHistoryAdapter}.
+     * @param totalSize
+     */
+    public void setUsedStorage(long totalSize) {
+        mTotalDownloadSize = totalSize;
+        update();
     }
 
     // OfflineItemFilterObserver implementation.
     @Override
     public void onItemsAdded(Collection<OfflineItem> items) {
-        computeStorage();
+        mTotalDownloadSize += getTotalSize(items);
+        update();
     }
 
     @Override
     public void onItemsRemoved(Collection<OfflineItem> items) {
-        computeStorage();
+        mTotalDownloadSize -= getTotalSize(items);
+        update();
     }
 
     @Override
-    public void onItemUpdated(OfflineItem oldItem, OfflineItem item) {}
+    public void onItemUpdated(OfflineItem oldItem, OfflineItem item) {
+        // Computes the delta of storage used by downloads.
+        mTotalDownloadSize -= oldItem.receivedBytes;
+        mTotalDownloadSize += oldItem.receivedBytes;
 
-    private void computeStorage() {
+        if (item.state != OfflineItemState.IN_PROGRESS) update();
+    }
+
+    private void computeTotalStorage() {
         DefaultDirectoryTask task = new DefaultDirectoryTask() {
             @Override
             protected void onPostExecute(DirectoryOption directoryOption) {
@@ -84,14 +112,19 @@ public class StorageSummaryProvider implements OfflineItemFilterObserver {
         task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
+    private long getTotalSize(Collection<OfflineItem> items) {
+        long totalSize = 0;
+        for (OfflineItem item : items) totalSize += item.receivedBytes;
+        return totalSize;
+    }
+
     private void update() {
         if (mDirectoryOption == null) return;
 
         // Build the storage summary string.
-        long usedSpace = mDirectoryOption.totalSpace - mDirectoryOption.availableSpace;
-        if (usedSpace < 0) usedSpace = 0;
+        assert(mTotalDownloadSize >= 0);
         String storageSummary = mContext.getString(R.string.download_manager_ui_space_using,
-                DownloadUtils.getStringForBytes(mContext, usedSpace),
+                DownloadUtils.getStringForBytes(mContext, mTotalDownloadSize),
                 DownloadUtils.getStringForBytes(mContext, mDirectoryOption.totalSpace));
         mDelegate.onStorageInfoChanged(storageSummary);
     }

chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java

@@ -407,7 +407,7 @@ public class DownloadHistoryAdapter
     @Override
     protected void bindViewHolderForHeaderItem(ViewHolder viewHolder, HeaderItem headerItem) {
         super.bindViewHolderForHeaderItem(viewHolder, headerItem);
-        mSpaceDisplay.onChanged();
+        updateStorageSummary();
     }
 
     /**
@@ -500,7 +500,7 @@ public class DownloadHistoryAdapter
                     if (TextUtils.equals(item.getId(), wrapper.getId())) {
                         view.displayItem(mBackendProvider, existingWrapper);
                         if (item.getDownloadInfo().state() == DownloadState.COMPLETE) {
-                            mSpaceDisplay.onChanged();
+                            updateStorageSummary();
                         }
                     }
                 }
@@ -901,7 +901,7 @@ public class DownloadHistoryAdapter
                     if (TextUtils.equals(item.id.id, view.getItem().getId())) {
                         view.displayItem(mBackendProvider, existingWrapper);
                         if (item.state == OfflineItemState.COMPLETE) {
-                            mSpaceDisplay.onChanged();
+                            updateStorageSummary();
                         }
                     }
                 }
@@ -929,4 +929,11 @@ public class DownloadHistoryAdapter
 
         return mTimeThresholdForRecentBadgeMs;
     }
+
+    private void updateStorageSummary() {
+        if (mSpaceDisplay != null) mSpaceDisplay.onChanged();
+        if (mStorageSummaryProvider != null) {
+            mStorageSummaryProvider.setUsedStorage(getTotalDownloadSize());
+        }
+    }
 }