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 9d99441ada4b12aa8e14eac1cd214d315eb37187..eae7f98b5ebbaf5a55721ffd9d18d05b185fae8e 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; |
@@ -1143,10 +1144,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() { |