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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java

Issue 290143004: [Android] Do not consume ACTION_CANCEL and ACTION_UP on the menu button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comment Created 6 years, 7 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 | 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/appmenu/AppMenuButtonHelper.java
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 baad0991246fcae354ac009994c90ee9959bfcad..f89dca7aaa5b8acc186275cd959078708022ce04 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
@@ -103,9 +103,13 @@ public class AppMenuButtonHelper extends SimpleOnGestureListener implements OnTo
@Override
public boolean onTouch(View view, MotionEvent event) {
+ // isMenuButtonReleased is a workaround for some versions of Android that do not
+ // reset pressed animations correctly on mMenuButton.setPressed(false).
+ boolean isMenuButtonReleased = false;
if (event.getActionMasked() == MotionEvent.ACTION_CANCEL ||
event.getActionMasked() == MotionEvent.ACTION_UP) {
mMenuButton.setPressed(false);
+ isMenuButtonReleased = true;
}
// This will take care of showing app menu.
@@ -118,6 +122,6 @@ public class AppMenuButtonHelper extends SimpleOnGestureListener implements OnTo
if (dragHelper != null && !isTouchEventConsumed) {
isTouchEventConsumed |= dragHelper.handleDragging(event);
}
- return isTouchEventConsumed;
+ return !isMenuButtonReleased && isTouchEventConsumed;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698