Download Home : Remove drawer UI

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

Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java
index ec03a48e546d16a54a525a355a162c36525b8fcc..8715c4e3ddcf66164c00444c6f1f876d5283762f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapter.java
@@ -155,6 +155,7 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
     private OfflinePageDownloadBridge.Observer mOfflinePageObserver;
     private int mFilter = DownloadFilter.FILTER_ALL;
     private String mSearchQuery = EMPTY_QUERY;
+    private SpaceDisplay mSpaceDisplay;
 
     DownloadHistoryAdapter(boolean showOffTheRecord, ComponentName parentComponent) {
         mShowOffTheRecord = showOffTheRecord;
@@ -328,6 +329,15 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
         return new DownloadItemGroup(timeStamp);
     }
 
+    @Override
+    protected BasicViewHolder createHeader(ViewGroup parent) {

[Theresa, 2017/04/24 20:48:17]

This may be called multiple times as views are recycled and re-used. We should
check that mSpaceDisplay == null before recreating it.

[shaktisahu, 2017/04/24 22:07:09]

I think this will be called only once during the creation i.e. after the call to
loadItems(). Next time onwards onBindViewHolder will be called which should take
care of the binding. HistoryAdapter#createHeader also acts likewise.

[Theresa, 2017/04/24 22:45:16]

We can loadItems() multiple times, though. That method is called every time the
filter changes. 

I also think that the whole nature of a RecyclerView is to free memory for items
that aren't being used. If you scroll down really far, the header viewhold will
eventually get freed. When you scroll back up, it will need to be recreated.

[shaktisahu, 2017/04/25 21:14:26]

Done. 

+        mSpaceDisplay = new SpaceDisplay(parent, this);
+        registerAdapterDataObserver(mSpaceDisplay);
+        mSpaceDisplay.onChanged();
+
+        return new BasicViewHolder(mSpaceDisplay.getView());
+    }
+
     /** Called when a new DownloadItem has been created by the native DownloadManager. */
     public void onDownloadItemCreated(DownloadItem item) {
         boolean isOffTheRecord = item.getDownloadInfo().isOffTheRecord();
@@ -420,6 +430,7 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
         getDownloadDelegate().removeDownloadHistoryAdapter(this);
         getOfflinePageBridge().removeObserver(mOfflinePageObserver);
         sDeletedFileTracker.decrementInstanceCount();
+        unregisterAdapterDataObserver(mSpaceDisplay);
     }
 
     @Override
@@ -510,6 +521,7 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
         }
 
         clear(false);
+        if (!filteredTimedItems.isEmpty()) addHeader();
         loadItems(filteredTimedItems);
     }
 
@@ -696,4 +708,9 @@ public class DownloadHistoryAdapter extends DateDividedAdapter
         RecordHistogram.recordCountHistogram("Android.DownloadManager.InitialCount.Total",
                 mRegularDownloadItems.size() + mOfflinePageItems.size());
     }
+
+    /** Returns the {@link SpaceDisplay}. */
+    public SpaceDisplay getSpaceDisplayForTests() {
+        return mSpaceDisplay;
+    }
 }