commit 430b79fd0e7255386b31ac4130b26124aa93b059
author Winson Chung <winsonc@google.com> Fri Aug 16 20:30:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 16 20:30:18 2013 +0000
tree 2349b735453d74c2cac613cfd5eac72bb3a7f96e
parent e3381e11b0dbee7e956f72c0d1b92904ab171acf
parent e7a852ef1511bc18a87168a0821c901e2600da4b

Merge "Cancelling long press on widgets if they don't handle touch/tap." into jb-ub-gel-agar

src/com/android/launcher3/LauncherAppWidgetHostView.java

diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java
index 6157a87..faec8b6 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java
@@ -87,6 +87,18 @@
         return false;
     }
 
+    public boolean onTouchEvent(MotionEvent ev) {
+        // If the widget does not handle touch, then cancel
+        // long press when we release the touch
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                mLongPressHelper.cancelLongPress();
+                break;
+        }
+        return false;
+    }
+
     @Override
     public void cancelLongPress() {
         super.cancelLongPress();