Merge "Fix right click to context menu behavior of View." (16e30f5e) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -4845,11 +4845,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @hide
		*/
		protected boolean performButtonActionOnTouchDown(MotionEvent event) {
		if ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
		if (showContextMenu(event.getX(), event.getY(), event.getMetaState())) {
		if (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE &&
		(event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
		showContextMenu(event.getX(), event.getY(), event.getMetaState());
		mPrivateFlags \|= PFLAG_CANCEL_NEXT_UP_EVENT;
		return true;
		}
		}
		return false;
		}