🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/src/org/chromium/chrome/browser/widget/selection/SelectableListLayout.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.widget.selection;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
 import android.support.v7.widget.RecyclerView.AdapterDataObserver;
 import android.support.v7.widget.RecyclerView.ItemAnimator;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
+import android.support.v7.widget.Toolbar;
 import android.support.v7.widget.Toolbar.OnMenuItemClickListener;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
@@ skipping 261 matching lines @@
                 padding, mRecyclerView.getPaddingTop(),
                 padding, mRecyclerView.getPaddingBottom());
     }
 
     @Override
     public void onSelectionStateChange(List<E> selectedItems) {
         setToolbarShadowVisibility();
     }
 
     /**
-     * Removes the content view from this view and returns it so that it may be re-attached
+     * Removes the toolbar view from this view and returns it so that it may be re-attached
      * elsewhere.
-     * @return The content view, which consists of the {@link RecyclerView} that holds the list of
-     *         items, the empty view, and the loading view.
+     * @return The toolbar view.
      */
-    public View detachContentView() {
-        View contentView = findViewById(R.id.list_content);
-        assert contentView != null;
-        removeView(contentView);
-
-        // The background color is typically set on the SelectableListLayout rather than the content
-        // view. Set the background color for the content view so that it is not transparent.
-        contentView.setBackground(getBackground());
-
-        return contentView;
+    public Toolbar detachToolbarView() {
+        removeView(mToolbar);
+        return mToolbar;
     }
 
     /**
      * Called when a search is starting.
      */
     public void onStartSearch() {
         mRecyclerView.setItemAnimator(null);
         mToolbarShadow.setVisibility(View.VISIBLE);
         mEmptyView.setText(mSearchEmptyStringResId);
     }
@@ skipping 38 matching lines @@
      */
     private void updateEmptyViewVisibility() {
         mEmptyView.setVisibility(mAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }
 
     @VisibleForTesting
     public View getToolbarShadowForTests() {
         return mToolbarShadow;
     }
 }