🏡 Show correct BottomSheetContent toolbar when contents swapped

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download.ui;
 
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.support.graphics.drawable.VectorDrawableCompat;
 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.Toolbar;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.FileUtils;
@@ skipping 145 matching lines @@
     private final SpaceDisplay mSpaceDisplay;
     private final ListView mFilterView;
     private final UndoDeletionSnackbarController mUndoDeletionSnackbarController;
     private final RecyclerView mRecyclerView;
 
     private BasicNativePage mNativePage;
     private Activity mActivity;
     private ViewGroup mMainView;
     private DownloadManagerToolbar mToolbar;
     private SelectableListLayout<DownloadHistoryItemWrapper> mSelectableListLayout;
+    private boolean mIsSeparateActivity;
 
-    @SuppressWarnings("unchecked")  // mSelectableListLayout
-    public DownloadManagerUi(
-            Activity activity, boolean isOffTheRecord, ComponentName parentComponent) {
+    /**
+     * Constructs a new DownloadManagerUi.
+     * @param activity The {@link Activity} associated with the download manager.
+     * @param isOffTheRecord Whether an off-the-record tab is currently being displayed.
+     * @param parentComponent The {@link ComponentName} of the parent activity.
+     * @param isSeparateActivity Whether the download manager UI will be shown in a separate
+     *                           activity than the main Chrome activity.
+     */
+    @SuppressWarnings("unchecked") // mSelectableListLayout
+    public DownloadManagerUi(Activity activity, boolean isOffTheRecord,
+            ComponentName parentComponent, boolean isSeparateActivity) {
         mActivity = activity;
         mBackendProvider =
                 sProviderForTests == null ? new DownloadBackendProvider() : sProviderForTests;
 
         mMainView = (ViewGroup) LayoutInflater.from(activity).inflate(R.layout.download_main, null);
 
         DrawerLayout drawerLayout = null;
         if (!DeviceFormFactor.isLargeTablet(activity)) {
             drawerLayout = (DrawerLayout) mMainView;
             addDrawerListener(drawerLayout);
@@ skipping 30 matching lines @@
                 this);
         mToolbar.setTitle(R.string.menu_downloads);
         mToolbar.initializeSearchView(this, R.string.download_manager_search, R.id.search_menu_id);
         addObserver(mToolbar);
 
         mFilterView = (ListView) mMainView.findViewById(R.id.section_list);
         mFilterView.setAdapter(mFilterAdapter);
         mFilterView.setOnItemClickListener(mFilterAdapter);
 
         mUndoDeletionSnackbarController = new UndoDeletionSnackbarController();
+
+        mIsSeparateActivity = isSeparateActivity;
+        if (!mIsSeparateActivity) mToolbar.removeCloseButton();
     }
 
     /**
      * Sets the {@link BasicNativePage} that holds this manager.
      */
     public void setBasicNativePage(BasicNativePage delegate) {
         mNativePage = delegate;
     }
 
     /**
@@ skipping 35 matching lines @@
     }
 
     /**
      * @return The view that shows the main download UI.
      */
     public ViewGroup getView() {
         return mMainView;
     }
 
     /**
-     * See {@link SelectableListLayout#detachContentView()}.
+     * See {@link SelectableListLayout#detachToolbarView()}.
      */
-    public View detachContentView() {
-        return mSelectableListLayout.detachContentView();
+    public Toolbar detachToolbarView() {
+        return mSelectableListLayout.detachToolbarView();
     }
 
     /**
      * @return The vertical scroll offset of the content view.
      */
     public int getVerticalScrollOffset() {
         return mRecyclerView.computeVerticalScrollOffset();
     }
 
     /**
      * Sets the download manager to the state that the url represents.
      */
     public void updateForUrl(String url) {
         int filter = DownloadFilter.getFilterFromUrl(url);
         onFilterChanged(filter);
     }
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        if (item.getItemId() == R.id.close_menu_id && !DeviceFormFactor.isTablet(mActivity)) {
+        if (item.getItemId() == R.id.close_menu_id && mIsSeparateActivity) {
             mActivity.finish();
             return true;
         } else if (item.getItemId() == R.id.selection_mode_delete_menu_id) {
             deleteSelectedItems();
             return true;
         } else if (item.getItemId() == R.id.selection_mode_share_menu_id) {
             shareSelectedItems();
             return true;
         } else if (item.getItemId() == R.id.search_menu_id) {
             mSelectableListLayout.onStartSearch();
@@ skipping 196 matching lines @@
     public SpaceDisplay getSpaceDisplayForTests() {
         return mSpaceDisplay;
     }
 
     /** Sets a BackendProvider that is used in place of a real one. */
     @VisibleForTesting
     public static void setProviderForTests(BackendProvider provider) {
         sProviderForTests = provider;
     }
 }