Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3502)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone.java

Issue 2755273002: Reland of Disable swipe down to enter the tab switcher in Chrome Home. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone.java
index aaa12a028fb4eed46f509b1aa6b5992d3da7e7da..9e12b097ad6249b2940ef6254272a308253b73e9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone.java
@@ -8,6 +8,7 @@
import android.view.ViewGroup;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeEventFilter.ScrollDirection;
import org.chromium.chrome.browser.compositor.layouts.phone.SimpleAnimationLayout;
import org.chromium.chrome.browser.compositor.overlays.SceneOverlay;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;
@@ -17,6 +18,7 @@
import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabmodel.TabModelUtils;
+import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
/**
@@ -45,6 +47,11 @@
// Set up layout parameters
mStaticLayout.setLayoutHandlesTabLifecycles(false);
mToolbarSwipeLayout.setMovesToolbar(true);
+ }
+
+ @Override
+ protected ToolbarSwipeHandler createToolbarSwipeHandler(LayoutProvider provider) {
+ return new PhoneToolbarSwipeHandler(provider);
}
@Override
@@ -150,4 +157,19 @@
mTitleCache.remove(id);
super.releaseTabLayout(id);
}
+
+ private class PhoneToolbarSwipeHandler extends ToolbarSwipeHandler {
+ public PhoneToolbarSwipeHandler(LayoutProvider provider) {
+ super(provider);
+ }
+
+ @Override
+ public boolean isSwipeEnabled(ScrollDirection direction) {
+ if (direction == ScrollDirection.DOWN && FeatureUtilities.isChromeHomeEnabled()) {
+ return false;
+ }
+
+ return super.isSwipeEnabled(direction);
+ }
+ }
}
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698