🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java

 // Copyright 2017 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;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ skipping 120 matching lines @@
 
     /** A handle to the FrameLayout that holds the content of the bottom sheet. */
     private FrameLayout mBottomSheetContentContainer;
 
     /**
      * The last ratio sent to observers of onTransitionPeekToHalf(). This is used to ensure the
      * final value sent to these observers is 1.0f.
      */
     private float mLastPeekToHalfRatioSent;
 
+    /** The FrameLayout used to hold the bottom sheet toolbar. */
+    private FrameLayout mToolbarHolder;
+
+    /**
+     * The default toolbar view. This is shown when the current bottom sheet content doesn't have
+     * its own toolbar and when the bottom sheet is closed.
+     */
+    private View mDefaultToolbarView;
+
+    /**
+     * The last non-default toolbar view that was attached to mToolbarHolder.

[mdjones, 2017/03/14 20:08:36]

nit: comment can be made single-line

[Theresa, 2017/03/14 20:40:02]

Done.

+     */
+    private View mLastToolbarView;
+
     /**
      * An interface defining content that can be displayed inside of the bottom sheet for Chrome
      * Home.
      */
     public interface BottomSheetContent {
         /**
          * Gets the {@link View} that holds the content to be displayed in the Chrome Home bottom
          * sheet.
          * @return The content view.
          */
@@ skipping 233 matching lines @@
                 setSheetState(mCurrentState, false);
             }
         });
 
         mPlaceholder = new View(getContext());
         LayoutParams placeHolderParams =
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         mPlaceholder.setBackgroundColor(
                 ApiCompatibilityUtils.getColor(getResources(), android.R.color.white));
         mBottomSheetContentContainer.addView(mPlaceholder, placeHolderParams);
+
+        mToolbarHolder = (FrameLayout) mControlContainer.findViewById(R.id.toolbar_holder);
     }
 
     @Override
     public int loadUrl(LoadUrlParams params, boolean incognito) {
         for (BottomSheetObserver o : mObservers) o.onLoadUrl(params.getUrl());
 
         // Native page URLs in this context do not need to communicate with the tab.
         if (NativePageFactory.isNativePageUrl(params.getUrl(), incognito)) {
             return TabLoadStatus.PAGE_LOAD_FAILED;
         }
@@ skipping 65 matching lines @@
         }
 
         if (content == null) {
             mBottomSheetContentContainer.addView(mPlaceholder);
             return;
         }
 
         mBottomSheetContentContainer.removeView(mPlaceholder);
         mSheetContent = content;
         mBottomSheetContentContainer.addView(mSheetContent.getContentView());
+
+        // This class is initialized before the toolbar is inflated, so mDefaultToolbar is
+        // initialized here rather than in #init().
+        if (mDefaultToolbarView == null) {

[mdjones, 2017/03/14 20:08:36]

It looks like it should be possible to swap the initialization code blocks in
ChromeActivity; I think the current order is arbitrary since they didn't depend
on each other.

[Theresa, 2017/03/14 20:40:02]

Done.

+            mDefaultToolbarView = mControlContainer.findViewById(R.id.toolbar);
+        }
+
+        if (mLastToolbarView != null) {
+            mToolbarHolder.removeView(mLastToolbarView);
+            mLastToolbarView = null;
+        }
+
+        if (mSheetContent.getToolbarView() != null) {
+            mLastToolbarView = mSheetContent.getToolbarView();
+            mToolbarHolder.addView(mSheetContent.getToolbarView());
+            mDefaultToolbarView.setVisibility(View.GONE);
+        } else {
+            mDefaultToolbarView.setVisibility(View.VISIBLE);
+        }
     }
 
     /**
      * Determines if a touch event is inside the toolbar. This assumes the toolbar is the full
      * width of the screen and that the toolbar is at the top of the bottom sheet.
      * @param e The motion event to test.
      * @return True if the event occured in the toolbar region.
      */
     private boolean isTouchEventInToolbar(MotionEvent e) {
         if (mControlContainer == null) return false;
@@ skipping 308 matching lines @@
     @Override
     public void onFadingViewVisibilityChanged(boolean visible) {}
 
     private boolean canMoveSheet() {
         boolean isInOverviewMode = mTabModelSelector != null
                 && (mTabModelSelector.getCurrentTab() == null
                            || mTabModelSelector.getCurrentTab().getActivity().isInOverviewMode());
         return !isToolbarAndroidViewHidden() && !isInOverviewMode;
     }
 }