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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java

Issue 1739203003: Add OverlayPanelEventFilter and tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move tests to separate CL Created 4 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/OverlayPanelEventFilter.java » ('j') | 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/bottombar/OverlayPanel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
index 539e9f99adff9dafd4208c5598aa2af00d4b447b..997f31bbacf306b1c5ab63954b2d262246a4400f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
@@ -16,6 +16,10 @@ import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.PanelPriority;
import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeEventFilter.ScrollDirection;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.GestureHandler;
import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.content.browser.ContentVideoViewEmbedder;
@@ -29,7 +33,7 @@ import org.chromium.ui.resources.ResourceManager;
* Controls the Overlay Panel.
*/
public class OverlayPanel extends OverlayPanelAnimation implements ActivityStateListener,
- OverlayPanelContentFactory {
+ EdgeSwipeHandler, GestureHandler, OverlayPanelContentFactory {
/**
* The extra dp added around the close button touch target.
@@ -90,9 +94,15 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
/** The initial height of the Overlay Panel. */
private float mInitialPanelHeight;
+ /** The initial location of a touch on the panel */
+ private float mInitialPanelTouchY;
+
/** Whether a touch gesture has been detected. */
private boolean mHasDetectedTouchGesture;
+ /** The EventFilter that this panel uses. */
+ protected EventFilter mEventFilter;
+
/** That factory that creates OverlayPanelContents. */
private OverlayPanelContentFactory mContentFactory;
@@ -716,4 +726,68 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
public void setOverlayPanelContentFactory(OverlayPanelContentFactory factory) {
mContentFactory = factory;
}
+
+ // ============================================================================================
+ // GestureHandler and EdgeSwipeHandler implementation.
+ // ============================================================================================
+
+ @Override
+ public void onDown(float x, float y, boolean fromMouse, int buttons) {
+ mInitialPanelTouchY = y;
+ handleSwipeStart();
+ }
+
+ @Override
+ public void drag(float x, float y, float deltaX, float deltaY, float tx, float ty) {
+ handleSwipeMove(y - mInitialPanelTouchY);
+ }
+
+ @Override
+ public void onUpOrCancel() {
+ handleSwipeEnd();
+ }
+
+ @Override
+ public void fling(float x, float y, float velocityX, float velocityY) {
+ handleFling(velocityY);
+ }
+
+ @Override
+ public void click(float x, float y, boolean fromMouse, int buttons) {
+ // TODO(mdjones): The time param for handleClick is not used anywhere, remove it.
+ handleClick(0, x, y);
+ }
+
+ @Override
+ public void onLongPress(float x, float y) {}
+
+ @Override
+ public void onPinch(float x0, float y0, float x1, float y1, boolean firstEvent) {}
+
+ // EdgeSwipeHandler implementation.
+
+ @Override
+ public void swipeStarted(ScrollDirection direction, float x, float y) {
+ handleSwipeStart();
+ }
+
+ @Override
+ public void swipeUpdated(float x, float y, float dx, float dy, float tx, float ty) {
+ handleSwipeMove(ty);
+ }
+
+ @Override
+ public void swipeFinished() {
+ handleSwipeEnd();
+ }
+
+ @Override
+ public void swipeFlingOccurred(float x, float y, float tx, float ty, float vx, float vy) {
+ handleFling(vy);
+ }
+
+ @Override
+ public boolean isSwipeEnabled(ScrollDirection direction) {
+ return direction == ScrollDirection.UP && isShowing();
+ }
}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/OverlayPanelEventFilter.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698