| Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
|
| index eb44cee421a05225b259feca349366eb2cad6df3..358e08554f4abdb14b5eae88852e4905137d8a09 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java
|
| @@ -14,7 +14,6 @@ import android.support.v4.view.GravityCompat;
|
| import android.support.v4.widget.DrawerLayout;
|
| import android.support.v4.widget.DrawerLayout.DrawerListener;
|
| import android.support.v7.widget.RecyclerView;
|
| -import android.support.v7.widget.RecyclerView.ItemAnimator;
|
| import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
|
| import android.view.Gravity;
|
| import android.view.LayoutInflater;
|
| @@ -174,7 +173,6 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
|
| private final ListView mFilterView;
|
| private final UndoDeletionSnackbarController mUndoDeletionSnackbarController;
|
| private final RecyclerView mRecyclerView;
|
| - private final ItemAnimator mItemAnimator;
|
|
|
| private BasicNativePage mNativePage;
|
| private Activity mActivity;
|
| @@ -201,16 +199,15 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
|
| mMainView.findViewById(R.id.selectable_list);
|
|
|
| mSelectableListLayout.initializeEmptyView(
|
| - VectorDrawableCompat.create(mActivity.getResources(),
|
| - R.drawable.downloads_big, mActivity.getTheme()),
|
| - R.string.download_manager_ui_empty);
|
| + VectorDrawableCompat.create(
|
| + mActivity.getResources(), R.drawable.downloads_big, mActivity.getTheme()),
|
| + R.string.download_manager_ui_empty, R.string.download_manager_no_results);
|
|
|
| mHistoryAdapter = new DownloadHistoryAdapter(isOffTheRecord, parentComponent);
|
| mRecyclerView = mSelectableListLayout.initializeRecyclerView(mHistoryAdapter);
|
| - mItemAnimator = mRecyclerView.getItemAnimator();
|
|
|
| // Prevent every progress update from causing a transition animation.
|
| - mItemAnimator.setChangeDuration(0);
|
| + mRecyclerView.getItemAnimator().setChangeDuration(0);
|
|
|
| mHistoryAdapter.initialize(mBackendProvider);
|
| addObserver(mHistoryAdapter);
|
| @@ -310,9 +307,8 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
|
| shareSelectedItems();
|
| return true;
|
| } else if (item.getItemId() == R.id.search_menu_id) {
|
| - mRecyclerView.setItemAnimator(null);
|
| + mSelectableListLayout.onStartSearch();
|
| mToolbar.showSearchView();
|
| - mSelectableListLayout.setEmptyViewText(R.string.download_manager_no_results);
|
| RecordUserAction.record("Android.DownloadManager.Search");
|
| return true;
|
| }
|
| @@ -391,9 +387,8 @@ public class DownloadManagerUi implements OnMenuItemClickListener, SearchDelegat
|
|
|
| @Override
|
| public void onEndSearch() {
|
| - mSelectableListLayout.setEmptyViewText(R.string.download_manager_ui_empty);
|
| + mSelectableListLayout.onEndSearch();
|
| mHistoryAdapter.onEndSearch();
|
| - mRecyclerView.setItemAnimator(mItemAnimator);
|
| }
|
|
|
| private void shareSelectedItems() {
|
|
|