Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java |
index f207e2b70868d4d8e0a664bc69cbf9e56cbf2bac..642c54da78e73a272ee4ab8d8debbc9486120f52 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java |
@@ -16,6 +16,7 @@ import org.chromium.chrome.browser.compositor.LayerTitleCache; |
import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Animatable; |
import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab; |
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; |
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.BlackHoleEventFilter; |
import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter; |
import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirection; |
import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer; |
@@ -69,6 +70,7 @@ public class ToolbarSwipeLayout extends Layout implements Animatable<ToolbarSwip |
private final float mSpaceBetweenTabs; |
private final float mCommitDistanceFromEdge; |
+ private final BlackHoleEventFilter mBlackHoleEventFilter; |
private final TabListSceneLayer mSceneLayer; |
private final Interpolator mEdgeInterpolator = new DecelerateInterpolator(); |
@@ -79,9 +81,10 @@ public class ToolbarSwipeLayout extends Layout implements Animatable<ToolbarSwip |
* @param renderHost The {@link LayoutRenderHost} view for this layout. |
* @param eventFilter The {@link EventFilter} that is needed for this view. |
*/ |
- public ToolbarSwipeLayout(Context context, LayoutUpdateHost updateHost, |
- LayoutRenderHost renderHost, EventFilter eventFilter) { |
- super(context, updateHost, renderHost, eventFilter); |
+ public ToolbarSwipeLayout( |
+ Context context, LayoutUpdateHost updateHost, LayoutRenderHost renderHost) { |
+ super(context, updateHost, renderHost); |
+ mBlackHoleEventFilter = new BlackHoleEventFilter(context); |
Resources res = context.getResources(); |
final float pxToDp = 1.0f / res.getDisplayMetrics().density; |
mCommitDistanceFromEdge = res.getDimension(R.dimen.toolbar_swipe_commit_distance) * pxToDp; |
@@ -355,6 +358,11 @@ public class ToolbarSwipeLayout extends Layout implements Animatable<ToolbarSwip |
public void onPropertyAnimationFinished(Property prop) {} |
@Override |
+ protected EventFilter getEventFilter() { |
+ return mBlackHoleEventFilter; |
+ } |
+ |
+ @Override |
protected SceneLayer getSceneLayer() { |
return mSceneLayer; |
} |