Add method to BottomSheetContent to allow custom peek height

This patch allows users of the BottomSheetContent api to choose the
height that their feature peeks at. Supplementing this change are
a number of height modes that the new getPeekHeight can return; namely
DEFAULT and DISABLED. These changes roll two existing methods into
a single, generic one.

All users of the api have been updated and tests have been added
for the new functionality.

Bug: 986310, 968246, 1012231, 1006029
Change-Id: Ia4b4c2c2839909c3c8f9da39b1b35283dd47eb9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832603
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705149}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomSheetContent.java

@@ -84,11 +84,6 @@ class AssistantBottomSheetContent implements BottomSheet.BottomSheetContent {
         return false;
     }
 
-    @Override
-    public boolean isPeekStateEnabled() {
-        return true;
-    }
-
     @Override
     public boolean wrapContentEnabled() {
         return true;

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetContent.java

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.tasks.tab_management;
 
 import android.view.View;
 
+import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.ContentPriority;
 import org.chromium.chrome.tab_ui.R;
@@ -54,8 +55,8 @@ public class TabGridSheetContent implements BottomSheetContent {
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
-        return false;
+    public int getPeekHeight() {
+        return BottomSheet.HeightMode.DISABLED;
     }
 
     @Override

chrome/android/java/res/layout/navigation_sheet_toolbar.xml

@@ -6,8 +6,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:paddingBottom="@dimen/navigation_sheet_toolbar_bottom_padding">
+    android:layout_marginTop="8dp">
     <ImageView
         android:id="@+id/drag_handlebar"
         android:layout_width="wrap_content"

chrome/android/java/res/values/dimens.xml

@@ -676,10 +676,10 @@
     <dimen name="navigation_bubble_text_bottom_padding">5dp</dimen>
     <dimen name="navigation_bubble_text_start_padding">2dp</dimen>
     <dimen name="navigation_bubble_text_end_padding">8dp</dimen>
-    <dimen name="navigation_sheet_toolbar_bottom_padding">44dp</dimen>
     <dimen name="navigation_sheet_content_top_padding">18dp</dimen>
     <dimen name="navigation_sheet_content_bottom_padding">4dp</dimen>
     <dimen name="navigation_sheet_content_wrap_padding">12dp</dimen>
+    <dimen name="navigation_sheet_peek_height">64dp</dimen>
 
     <!-- ChromeTextInputLayout dimensions -->
     <dimen name="text_input_layout_padding_start">3dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java

@@ -34,6 +34,8 @@ import org.chromium.ui.base.ActivityWindowAndroid;
  * Represents ephemeral tab content and the toolbar, which can be included inside the bottom sheet.
  */
 public class EphemeralTabSheetContent implements BottomSheet.BottomSheetContent {
+    private static final float PEEK_TOOLBAR_HEIGHT_MULTIPLE = 2.f;
+
     private final Context mContext;
     private final Runnable mOpenNewTabCallback;
     private final Runnable mToolbarClickCallback;
@@ -192,8 +194,10 @@ public class EphemeralTabSheetContent implements BottomSheet.BottomSheetContent
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
-        return true;
+    public int getPeekHeight() {
+        int toolbarHeight =
+                mContext.getResources().getDimensionPixelSize(R.dimen.toolbar_height_no_shadow);
+        return (int) (toolbarHeight * PEEK_TOOLBAR_HEIGHT_MULTIPLE);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/gesturenav/NavigationSheetCoordinator.java

@@ -293,11 +293,13 @@ class NavigationSheetCoordinator implements BottomSheetContent, NavigationSheet
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
+    public int getPeekHeight() {
         // Makes peek state as 'not present' when bottom sheet is in expanded state (i.e. animating
         // from expanded to close state). It avoids the sheet animating in two distinct steps, which
         // looks awkward.
-        return !mBottomSheetController.get().getBottomSheet().isSheetOpen();
+        return !mBottomSheetController.get().getBottomSheet().isSheetOpen()
+                ? getSizePx(mParentView.getContext(), R.dimen.navigation_sheet_peek_height)
+                : BottomSheet.HeightMode.DISABLED;
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerView.java

@@ -52,8 +52,8 @@ import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetCon
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
-        return false;
+    public int getPeekHeight() {
+        return BottomSheet.HeightMode.DISABLED;
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/payments/micro/MicrotransactionView.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
+import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.HeightMode;
 
 /** Microtransaction UI. */
 /* package */ class MicrotransactionView implements BottomSheetContent {
@@ -113,8 +114,8 @@ import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetCon
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
-        return mIsPeekStateEnabled;
+    public int getPeekHeight() {
+        return mIsPeekStateEnabled ? HeightMode.DEFAULT : HeightMode.DISABLED;
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java

@@ -105,9 +105,9 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
+    public int getPeekHeight() {
         // Return false to ensure that the entire bottom sheet is shown.
-        return false;
+        return BottomSheet.HeightMode.DISABLED;
     }
 
     @Override

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

@@ -142,10 +142,7 @@ public class BottomSheetController implements Destroyable {
             public void onScrimClick() {
                 if (!mBottomSheet.isSheetOpen()) return;
                 mBottomSheet.setSheetState(
-                        mBottomSheet.getCurrentSheetContent().isPeekStateEnabled()
-                                ? BottomSheet.SheetState.PEEK
-                                : BottomSheet.SheetState.HIDDEN,
-                        true, StateChangeReason.TAP_SCRIM);
+                        mBottomSheet.getMinSwipableSheetState(), true, StateChangeReason.TAP_SCRIM);
             }
 
             @Override
@@ -223,7 +220,7 @@ public class BottomSheetController implements Destroyable {
         mIsSuppressed = false;
 
         if (mBottomSheet.getCurrentSheetContent() != null) {
-            mBottomSheet.setSheetState(BottomSheet.SheetState.PEEK, true);
+            mBottomSheet.setSheetState(mBottomSheet.getOpeningState(), true);
         } else {
             // In the event the previous content was hidden, try to show the next one.
             showNextContent(true);
@@ -322,7 +319,7 @@ public class BottomSheetController implements Destroyable {
 
         BottomSheetContent nextContent = mContentQueue.poll();
         mBottomSheet.showContent(nextContent);
-        mBottomSheet.setSheetState(BottomSheet.SheetState.PEEK, animate);
+        mBottomSheet.setSheetState(mBottomSheet.getOpeningState(), animate);
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/gesturenav/NavigationSheetTest.java

@@ -16,6 +16,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
@@ -33,7 +34,6 @@ import org.chromium.content_public.browser.test.mock.MockNavigationController;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.content_public.browser.test.util.TouchCommon;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
 import org.chromium.ui.test.util.UiRestriction;
 
@@ -138,10 +138,11 @@ public class NavigationSheetTest {
         NavigationSheetCoordinator sheet = (NavigationSheetCoordinator) showPopup(controller);
         ListView listview = sheet.getContentView().findViewById(R.id.navigation_entries);
 
-        CriteriaHelper.pollUiThread(sheet::isExpanded);
+        CriteriaHelper.pollUiThread(() -> listview.getChildCount() >= 2);
         Assert.assertEquals(INVALID_NAVIGATION_INDEX, controller.mNavigatedIndex);
 
-        TouchCommon.singleClickView(listview.getChildAt(1));
+        ThreadUtils.runOnUiThreadBlocking(() -> listview.getChildAt(1).callOnClick());
+
         CriteriaHelper.pollUiThread(sheet::isHidden);
         CriteriaHelper.pollUiThread(
                 Criteria.equals(NAVIGATION_INDEX_2, () -> controller.mNavigatedIndex));

chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java

@@ -85,9 +85,9 @@ public class BottomSheetControllerTest {
             mHighPriorityContent = new TestBottomSheetContent(
                     mActivityTestRule.getActivity(), ContentPriority.HIGH, false);
 
-            mPeekableContent = new TestBottomSheetContent(mActivityTestRule.getActivity(), true);
-            mNonPeekableContent =
-                    new TestBottomSheetContent(mActivityTestRule.getActivity(), false);
+            mPeekableContent = new TestBottomSheetContent(mActivityTestRule.getActivity());
+            mNonPeekableContent = new TestBottomSheetContent(mActivityTestRule.getActivity());
+            mNonPeekableContent.setPeekHeight(BottomSheet.HeightMode.DISABLED);
         });
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/TestBottomSheetContent.java

@@ -30,20 +30,19 @@ public class TestBottomSheetContent implements BottomSheetContent {
     /** Whether this content is browser specific. */
     private boolean mHasCustomLifecycle;
 
-    /** Whether this content's peek state is enabled. */
-    private boolean mPeekStateEnabled;
+    /** The peek height of this content. */
+    private int mPeekHeight;
 
     /**
      * @param context A context to inflate views with.
      * @param priority The content's priority.
      * @param hasCustomLifecycle Whether the content is browser specific.
-     * @param peekStateEnabled Whether the content's peek state is enabled.
      */
-    public TestBottomSheetContent(Context context, @ContentPriority int priority,
-            boolean hasCustomLifecycle, boolean peekStateEnabled) {
+    public TestBottomSheetContent(
+            Context context, @ContentPriority int priority, boolean hasCustomLifecycle) {
+        mPeekHeight = BottomSheet.HeightMode.DEFAULT;
         mPriority = priority;
         mHasCustomLifecycle = hasCustomLifecycle;
-        mPeekStateEnabled = peekStateEnabled;
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             mToolbarView = new View(context);
             ViewGroup.LayoutParams params =
@@ -61,20 +60,9 @@ public class TestBottomSheetContent implements BottomSheetContent {
 
     /**
      * @param context A context to inflate views with.
-     * @param priority The content's priority.
-     * @param hasCustomLifecycle Whether the content is browser specific.
      */
-    public TestBottomSheetContent(
-            Context context, @ContentPriority int priority, boolean hasCustomLifecycle) {
-        this(context, priority, hasCustomLifecycle, true);
-    }
-
-    /**
-     * @param context A context to inflate views with.
-     * @param peekStateEnabled Whether the content's peek state is enabled.
-     */
-    public TestBottomSheetContent(Context context, boolean peekStateEnabled) {
-        this(/*TestBottomSheetContent(*/ context, ContentPriority.LOW, false, peekStateEnabled);
+    public TestBottomSheetContent(Context context) {
+        this(/*TestBottomSheetContent(*/ context, ContentPriority.LOW, false);
     }
 
     @Override
@@ -106,9 +94,13 @@ public class TestBottomSheetContent implements BottomSheetContent {
         return false;
     }
 
+    public void setPeekHeight(int height) {
+        mPeekHeight = height;
+    }
+
     @Override
-    public boolean isPeekStateEnabled() {
-        return mPeekStateEnabled;
+    public int getPeekHeight() {
+        return mPeekHeight;
     }
 
     @Override

chrome/browser/touch_to_fill/android/internal/java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillView.java

@@ -39,13 +39,6 @@ class TouchToFillView implements BottomSheet.BottomSheetContent {
             mEventListener.onDismissed();
             mBottomSheetController.getBottomSheet().removeObserver(mBottomSheetObserver);
         }
-
-        @Override
-        public void onSheetFullyPeeked() {
-            super.onSheetFullyPeeked();
-            // Since isPeekStateEnabled doesn't seem to skip the Peek state, force-expand the sheet.
-            mBottomSheetController.expandSheet();
-        }
     };
 
     /**
@@ -150,8 +143,8 @@ class TouchToFillView implements BottomSheet.BottomSheetContent {
     }
 
     @Override
-    public boolean isPeekStateEnabled() {
-        return true; // For some reason, false isn't working properly. Extend it explicitly!
+    public int getPeekHeight() {
+        return BottomSheet.HeightMode.DISABLED;
     }
 
     @Override