🏠 Add expand button and flag to enable it

chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.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.toolbar;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.os.SystemClock;
 import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.SysUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.util.ColorUtils;
+import org.chromium.chrome.browser.util.FeatureUtilities;
+import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetMetrics;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver;
 import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver;
 
 /**
  * Phone specific toolbar that exists at the bottom of the screen.
  */
 public class BottomToolbarPhone extends ToolbarPhone {
     /**
@@ skipping 49 matching lines @@
 
     /** The white version of the toolbar handle; used for dark themes and incognito. */
     private final Drawable mHandleLight;
 
     /** The dark version of the toolbar handle; this is the default handle to use. */
     private final Drawable mHandleDark;
 
     /** A handle to the bottom sheet. */
     private BottomSheet mBottomSheet;
 
+    /** A handle to the expand button that Chrome Home may or may not use. */
+    private TintedImageButton mExpandButton;
+
     /**
      * Whether the end toolbar buttons should be hidden regardless of whether the URL bar is
      * focused.
      */
     private boolean mShouldHideEndToolbarButtons;
 
     /**
      * This tracks the height fraction of the bottom bar to determine if it is moving up or down.
      */
     private float mLastHeightFraction;
 
     /** The toolbar handle view that indicates the toolbar can be pulled upward. */
     private ImageView mToolbarHandleView;
 
     /** Whether accessibility is enabled. */
     private boolean mAccessibilityEnabled;
 
+    /** Whether or not the toolbar handle should be used. */
+    private boolean mUseToolbarHandle;
+
     /**
      * Constructs a BottomToolbarPhone object.
      * @param context The Context in which this View object is created.
      * @param attrs The AttributeSet that was specified with this View.
      */
     public BottomToolbarPhone(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         mHandleDark = ApiCompatibilityUtils.getDrawable(
                 context.getResources(), R.drawable.toolbar_handle_dark);
         mHandleLight = ApiCompatibilityUtils.getDrawable(
                 context.getResources(), R.drawable.toolbar_handle_light);
         mLocationBarVerticalMargin =
                 getResources().getDimensionPixelOffset(R.dimen.bottom_location_bar_vertical_margin);
+        mUseToolbarHandle = true;
     }
 
     /**
      * Set the color of the pull handle used by the toolbar.
      * @param useLightDrawable If the handle color should be light.
      */
     public void updateHandleTint(boolean useLightDrawable) {
+        if (!mUseToolbarHandle) return;
         mToolbarHandleView.setImageDrawable(useLightDrawable ? mHandleLight : mHandleDark);
     }
 
     /**
      * @return Whether or not the toolbar is currently using a light theme color.
      */
     public boolean isLightTheme() {
         return !ColorUtils.shouldUseLightForegroundOnBackground(getTabThemeColor());
     }
 
@@ skipping 57 matching lines @@
         ViewGroup coordinator = (ViewGroup) getRootView().findViewById(R.id.coordinator);
         coordinator.addView(mProgressBar);
         mProgressBar.setProgressBarContainer(coordinator);
     }
 
     /**
      * @return The extra top margin that should be applied to the browser controls views to
      *         correctly offset them from the handle that sits above them.
      */
     private int getExtraTopMargin() {
+        if (!mUseToolbarHandle) return 0;
         return getResources().getDimensionPixelSize(R.dimen.bottom_toolbar_top_margin);
     }
 
     @Override
+    protected int getBoundsAfterAccountingForLeftButton() {
+        int padding = super.getBoundsAfterAccountingForLeftButton();
+        if (!mUseToolbarHandle && mExpandButton != null && mExpandButton.getVisibility() != GONE) {

[gone, 2017/04/30 01:56:00]

You constantly use !mUseToolbarHandle && mExpandButton != null.  Pull it out
into another function to keep your checks consistent.

[mdjones, 2017/05/01 20:46:08]

Removed the null checks.

+            padding = mExpandButton.getMeasuredWidth()
+                    + getResources().getDimensionPixelSize(
+                              R.dimen.chrome_home_expand_button_extra_padding);
+        }
+        return padding;
+    }
+
+    @Override
+    public void updateButtonVisibility() {
+        super.updateButtonVisibility();
+        if (!mUseToolbarHandle && mExpandButton != null) {
+            mExpandButton.setVisibility(
+                    urlHasFocus() || isTabSwitcherAnimationRunning() ? INVISIBLE : VISIBLE);
+        }
+    }
+
+    @Override
+    protected void updateUrlExpansionAnimation() {
+        super.updateUrlExpansionAnimation();
+
+        if (!mUseToolbarHandle && mExpandButton != null) {
+            mExpandButton.setVisibility(mShouldHideEndToolbarButtons ? View.GONE : View.VISIBLE);
+        }
+    }
+
+    @Override
     public void onFinishInflate() {
         super.onFinishInflate();
 
+        if (mExpandButton != null) {
+            // Make the "expand" button square.
+            mExpandButton.getLayoutParams().width = mExpandButton.getHeight();
+        }
+
         // Add extra top margin to the URL bar to compensate for the change to location bar's
         // vertical margin in the constructor.
         ((MarginLayoutParams) mLocationBar.findViewById(R.id.url_bar).getLayoutParams()).topMargin =
                 getResources().getDimensionPixelSize(R.dimen.bottom_toolbar_url_bar_top_margin);
 
         // Exclude the location bar from the list of browsing mode views. This prevents its
         // visibility from changing during transitions.
         mBrowsingModeViews.remove(mLocationBar);
 
+        updateToolbarTopMargin();
+    }
+
+    /**
+     * Update the top margin of all the components inside the toolbar. If the toolbar handle is
+     * being used, extra margin is added.
+     */
+    private void updateToolbarTopMargin() {
         // Programmatically apply a top margin to all the children of the toolbar container. This
         // is done so the view hierarchy does not need to be changed.
         int topMarginForControls = getExtraTopMargin();
+        if (topMarginForControls == 0) return;
 
         View topShadow = findViewById(R.id.bottom_toolbar_shadow);
 
         for (int i = 0; i < getChildCount(); i++) {
             View curView = getChildAt(i);
 
             // Skip the shadow that sits at the top of the toolbar since this needs to sit on top
             // of the toolbar.
             if (curView == topShadow) continue;
 
             ((MarginLayoutParams) curView.getLayoutParams()).topMargin = topMarginForControls;
         }
     }
 
     @Override
     public void onAttachedToWindow() {
         super.onAttachedToWindow();
 
-        // The toolbar handle is part of the control container so it can draw on top of the other
-        // toolbar views. Get the root view and search for the handle.
+        // The toolbar handle is part of the control container so it can draw on top of the

[gone, 2017/04/30 01:56:00]

why?

[mdjones, 2017/05/01 20:46:08]

Reasons.

+        // other toolbar views. Get the root view and search for the handle.
         mToolbarHandleView = (ImageView) getRootView().findViewById(R.id.toolbar_handle);
         mToolbarHandleView.setImageDrawable(mHandleDark);
     }
 
     @Override
+    public void onNativeLibraryReady() {
+        super.onNativeLibraryReady();
+
+        mUseToolbarHandle = !FeatureUtilities.isChromeHomeExpandButtonEnabled();
+        mExpandButton = (TintedImageButton) findViewById(R.id.expand_sheet_button);
+        mExpandButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mBottomSheet == null) return;
+
+                mBottomSheet.setSheetState(BottomSheet.SHEET_STATE_HALF, true);
+            }
+        });
+
+        if (!mUseToolbarHandle) {
+            mToolbarHandleView.setVisibility(View.GONE);
+
+            // If not using the toolbar handle, change the height of the control container to be
+            // the same as the top toolbar.
+            getRootView().findViewById(R.id.control_container).getLayoutParams().height =
+                    getResources().getDimensionPixelSize(R.dimen.control_container_height)
+                    + getResources().getDimensionPixelSize(R.dimen.toolbar_shadow_height);
+        } else {
+            mExpandButton.setVisibility(View.VISIBLE);
+            mBrowsingModeViews.add(mExpandButton);
+        }
+
+        updateToolbarTopMargin();
+    }
+
+    @Override
     protected void updateVisualsForToolbarState() {
         super.updateVisualsForToolbarState();
 
         // TODO(mdjones): Creating a new tab from the tab switcher skips the
         // drawTabSwitcherFadeAnimation which would otherwise make this line unnecessary.
-        if (mTabSwitcherState == STATIC_TAB) mToolbarHandleView.setAlpha(1f);
+        if (mTabSwitcherState == STATIC_TAB && mUseToolbarHandle) mToolbarHandleView.setAlpha(1f);
 
         // The tab switcher's background color should not affect the toolbar handle; it should only
         // switch color based on the static tab's theme color. This is done so fade in/out looks
         // correct.
-        mToolbarHandleView.setImageDrawable(isLightTheme() ? mHandleDark : mHandleLight);
+        if (mUseToolbarHandle) {

[gone, 2017/04/30 01:56:00]

You treat the toolbar handle's non-existence as an assumption that the expand
button exists, but in other places you explicitly check for the expand button to
not be null.  Why?

[mdjones, 2017/05/01 20:46:08]

The expand button waits for the native library to be ready to check if it's
needed before setting it. I moved the expand button to always be set in
onFinishInflate and removed the checks.

+            mToolbarHandleView.setImageDrawable(isLightTheme() ? mHandleDark : mHandleLight);
+        } else {
+            ColorStateList tint = mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint;
+            mExpandButton.setTint(tint);
+        }
     }
 
     @Override
     protected void updateLocationBarBackgroundBounds(Rect out, VisualState visualState) {
         super.updateLocationBarBackgroundBounds(out, visualState);
 
         // Allow the location bar to expand to the full height of the control container.
         out.top -= getExtraTopMargin() * mUrlExpansionPercent;
     }
 
     @Override
     protected boolean shouldDrawLocationBar() {
         return true;
     }
 
     @Override
     protected void drawTabSwitcherFadeAnimation(boolean animationFinished, float progress) {
         mNewTabButton.setAlpha(progress);
 
         mLocationBar.setAlpha(1f - progress);
-        mToolbarHandleView.setAlpha(1f - progress);
+        if (mUseToolbarHandle) mToolbarHandleView.setAlpha(1f - progress);
 
         int tabSwitcherThemeColor = getToolbarColorForVisualState(VisualState.TAB_SWITCHER_NORMAL);
 
         updateToolbarBackground(ColorUtils.getColorWithOverlay(
                 getTabThemeColor(), tabSwitcherThemeColor, progress));
 
         // Don't use transparency for accessibility mode or low-end devices since the
         // {@link OverviewListLayout} will be used instead of the normal tab switcher.
         if (!mAccessibilityEnabled && !SysUtils.isLowEndDevice()) {
             float alphaTransition = 1f - TAB_SWITCHER_TOOLBAR_ALPHA;
@@ skipping 10 matching lines @@
     @Override
     protected void onAccessibilityStatusChanged(boolean enabled) {
         super.onAccessibilityStatusChanged(enabled);
         mAccessibilityEnabled = enabled;
     }
 
     @Override
     protected void drawTabSwitcherAnimationOverlay(Canvas canvas, float animationProgress) {
         // Intentionally overridden to block everything but the compositor screen shot. Otherwise
         // the toolbar in Chrome Home does not have an animation overlay component.
-        if (mTextureCaptureMode) super.drawTabSwitcherAnimationOverlay(canvas, 0f);
+        if (mTextureCaptureMode) {
+            super.drawTabSwitcherAnimationOverlay(canvas, 0f);
+            float previousAlpha = 0.f;

[gone, 2017/04/30 01:56:00]

Where do you actually use this?

[mdjones, 2017/05/01 20:46:08]

I don't any more. Removed.

+            if (mExpandButton != null && mExpandButton.getVisibility() != View.GONE) {
+                drawChild(canvas, mExpandButton, SystemClock.uptimeMillis());
+            }
+        }
     }
 
     @Override
     protected void resetNtpAnimationValues() {
         // The NTP animations don't matter if the browser is in tab switcher mode.
         if (mTabSwitcherState != ToolbarPhone.STATIC_TAB) return;
         super.resetNtpAnimationValues();
     }
 
     @Override
@@ skipping 34 matching lines @@
         otherToolbar.setTitleTextAppearance(
                 otherToolbar.getContext(), R.style.BottomSheetContentTitle);
         ApiCompatibilityUtils.setPaddingRelative(otherToolbar,
                 ApiCompatibilityUtils.getPaddingStart(otherToolbar),
                 otherToolbar.getPaddingTop() + extraTopMargin,
                 ApiCompatibilityUtils.getPaddingEnd(otherToolbar), otherToolbar.getPaddingBottom());
 
         otherToolbar.requestLayout();
     }
 }