🏠 Add expand button and flag to enable it

chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
index dc8f17ea993baaae556eeb57af3d259fb882c9c2..77db20aca3c4b068033ce161f7a7af0ee59acdfa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java
@@ -5,10 +5,12 @@
 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;
@@ -19,6 +21,8 @@ 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;
@@ -88,6 +92,9 @@ public class BottomToolbarPhone extends ToolbarPhone {
     /** 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.
@@ -105,6 +112,9 @@ public class BottomToolbarPhone extends ToolbarPhone {
     /** 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.
@@ -119,6 +129,7 @@ public class BottomToolbarPhone extends ToolbarPhone {
                 context.getResources(), R.drawable.toolbar_handle_light);
         mLocationBarVerticalMargin =
                 getResources().getDimensionPixelOffset(R.dimen.bottom_location_bar_vertical_margin);
+        mUseToolbarHandle = true;
     }
 
     /**
@@ -126,6 +137,7 @@ public class BottomToolbarPhone extends ToolbarPhone {
      * @param useLightDrawable If the handle color should be light.
      */
     public void updateHandleTint(boolean useLightDrawable) {
+        if (!mUseToolbarHandle) return;
         mToolbarHandleView.setImageDrawable(useLightDrawable ? mHandleLight : mHandleDark);
     }
 
@@ -203,10 +215,38 @@ public class BottomToolbarPhone extends ToolbarPhone {
      *         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 = 0;
+        if (!mUseToolbarHandle && mExpandButton != null && mExpandButton.getVisibility() != GONE) {
+            padding = mExpandButton.getMeasuredWidth();
+        }
+        return padding + super.getBoundsAfterAccountingForLeftButton();
+    }
+
+    @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();
 
@@ -219,6 +259,14 @@ public class BottomToolbarPhone extends ToolbarPhone {
         // 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();

[Theresa, 2017/04/28 21:50:32]

Should we return early if getExtraTopMargin() == 0?

[mdjones, 2017/04/28 22:15:30]

Yep, done.

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

Turns out we can't do this. Since the toolbar is initialized with a non-zero
number before the button is setup, this needs to run with 0 in order to
correctly reset the views.

@@ -240,24 +288,60 @@ public class BottomToolbarPhone extends ToolbarPhone {
     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
+        // 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) {
+            mToolbarHandleView.setImageDrawable(isLightTheme() ? mHandleDark : mHandleLight);
+        } else {
+            ColorStateList tint = mUseLightToolbarDrawables ? mLightModeTint : mDarkModeTint;
+            mExpandButton.setTint(tint);
+        }
     }
 
     @Override
@@ -278,7 +362,7 @@ public class BottomToolbarPhone extends ToolbarPhone {
         mNewTabButton.setAlpha(progress);
 
         mLocationBar.setAlpha(1f - progress);
-        mToolbarHandleView.setAlpha(1f - progress);
+        if (mUseToolbarHandle) mToolbarHandleView.setAlpha(1f - progress);
 
         int tabSwitcherThemeColor = getToolbarColorForVisualState(VisualState.TAB_SWITCHER_NORMAL);
 
@@ -309,7 +393,13 @@ public class BottomToolbarPhone extends ToolbarPhone {
     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;
+            if (mExpandButton != null && mExpandButton.getVisibility() != View.GONE) {
+                drawChild(canvas, mExpandButton, SystemClock.uptimeMillis());
+            }
+        }
     }
 
     @Override