Merge 286447 "[Android] Show AppMenu on dragging menu button to ..."

> [Android] Show AppMenu on dragging menu button to any direction.
> 
> AppMenu popup was under the menu button so we only had to drag down.
> But it's changed and the popup also spans to left (right on RTL).
> So make the AppMenu button draggable to any direction, not only down.
> 
> BUG=375379
> 
> Review URL: https://codereview.chromium.org/429083002

TBR=kkimlabs@chromium.org

Review URL: https://codereview.chromium.org/479253002

git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@290293 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java
index f89dca7..8006249 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java
@@ -69,6 +69,14 @@ public class AppMenuButtonHelper extends SimpleOnGestureListener implements OnTo
     }
 
     /**
+     * @return Whether app menu is active. That is, AppMenu is showing or menu button is consuming
+     *         touch events to prepare AppMenu showing.
+     */
+    public boolean isAppMenuActive() {
+        return mMenuButton.isPressed() || mMenuHandler.isAppMenuShowing();
+    }
+
+    /**
      * Handle the key press event on a menu button.
      * @return Whether the app menu was shown as a result of this action.
      */
@@ -95,10 +103,7 @@ public class AppMenuButtonHelper extends SimpleOnGestureListener implements OnTo
         if (mSeenFirstScrollEvent) return false;
         mSeenFirstScrollEvent = true;
 
-        // If the scrolling direction is roughly down on the first onScroll detection,
-        // we consider it as dragging start, so shows the app menu. Otherwise, we
-        // don't show menu so that toolbar horizontal swiping can happen.
-        return -distanceY >= Math.abs(distanceX) && showAppMenu(true);
+        return showAppMenu(true);
     }
 
     @Override