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..a0cb4f9a8862bcaaab2758bb58945326ef3fb85d 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,17 @@ public class DownloadHistoryAdapter extends DateDividedAdapter |
return new DownloadItemGroup(timeStamp); |
} |
+ @Override |
+ protected BasicViewHolder createHeader(ViewGroup parent) { |
+ if (mSpaceDisplay == null) { |
+ 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 +432,7 @@ public class DownloadHistoryAdapter extends DateDividedAdapter |
getDownloadDelegate().removeDownloadHistoryAdapter(this); |
getOfflinePageBridge().removeObserver(mOfflinePageObserver); |
sDeletedFileTracker.decrementInstanceCount(); |
+ unregisterAdapterDataObserver(mSpaceDisplay); |
Theresa
2017/04/25 21:48:49
We should probably have a mSpaceDisplay != null ch
shaktisahu
2017/04/25 22:24:15
Done. Thanks!
|
} |
@Override |
@@ -510,6 +523,7 @@ public class DownloadHistoryAdapter extends DateDividedAdapter |
} |
clear(false); |
+ if (!filteredTimedItems.isEmpty()) addHeader(); |
loadItems(filteredTimedItems); |
} |
@@ -696,4 +710,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; |
+ } |
} |