🏠 Add expand button and flag to enable it

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

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
index c0d4eaae337cfc06d1db46967a22047f05a4ea15..48602af38b47d2ece5e6084edd9c66138dda557a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
@@ -43,6 +43,7 @@ import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.BottomToolbarPhone;
+import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.widget.FadingBackgroundView;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContentController.ContentType;
@@ -382,6 +383,14 @@ public class BottomSheet
         mIsTouchEnabled = enabled;
     }
 
+    /**
+     * A notification that the "expand" button for the bottom sheet has been pressed.
+     */
+    public void onExpandButtonPressed() {
+        mMetrics.recordSheetOpenReason(BottomSheetMetrics.OPENED_BY_EXPAND_BUTTON);
+        setSheetState(BottomSheet.SHEET_STATE_HALF, true);
+    }
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent e) {
         // If touch is disabled, act like a black hole and consume touch events without doing
@@ -1146,10 +1155,16 @@ public class BottomSheet
                 && (mTabModelSelector.getCurrentTab() == null
                            || mTabModelSelector.getCurrentTab().getActivity().isInOverviewMode());
 
+        // If the expand button is enabled, do not allow swiping when the sheet is in the peeking
+        // position.
+        boolean blockPeekingSwipes = FeatureUtilities.isChromeHomeExpandButtonEnabled()
+                && getSheetState() == SHEET_STATE_PEEK;
+
         if (mFindInPageView == null) mFindInPageView = findViewById(R.id.find_toolbar);
         boolean isFindInPageVisible =
                 mFindInPageView != null && mFindInPageView.getVisibility() == View.VISIBLE;
-        return !isToolbarAndroidViewHidden() && !isInOverviewMode && !isFindInPageVisible;
+        return !isToolbarAndroidViewHidden() && !isInOverviewMode && !isFindInPageVisible
+                && !blockPeekingSwipes;
     }
 
     private void showHelpBubbleIfNecessary() {