commit 3798b643cd8a5c7c85864eced90374cf0fb45640
author Adam Cohen <adamcohen@google.com> Wed Oct 16 10:30:50 2013 -0700
committer Adam Cohen <adamcohen@google.com> Wed Oct 16 10:41:10 2013 -0700
tree 9a33f1f0416af0c3f5e4e994f40e9a1940d609e8
parent da6ab129b7bc6fcaf4bdebb18884103431d089d5

Fix issue where you could trigger a click after long pressing a widget (issue 11186227)

Change-Id: I5a767ac6352f7efb4d3c6c2768c8d2aaaa913f3f

src/com/android/launcher3/LauncherAppWidgetHostView.java

diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java
index 83aef1a..51a649a 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java
@@ -65,6 +65,12 @@
     }
 
     public boolean onInterceptTouchEvent(MotionEvent ev) {
+        // Just in case the previous long press hasn't been cleared, we make sure to start fresh
+        // on touch down.
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            mLongPressHelper.cancelLongPress();
+        }
+
         // Consume any touch events for ourselves after longpress is triggered
         if (mLongPressHelper.hasPerformedLongPress()) {
             mLongPressHelper.cancelLongPress();
@@ -110,13 +116,15 @@
 
     @Override
     public void onTouchComplete() {
-        mLongPressHelper.cancelLongPress();
+        if (!mLongPressHelper.hasPerformedLongPress()) {
+            // If a long press has been performed, we don't want to clear the record of that since
+            // we still may be receiving a touch up which we want to intercept
+            mLongPressHelper.cancelLongPress();
+        }
     }
 
     @Override
     public int getDescendantFocusability() {
         return ViewGroup.FOCUS_BLOCK_DESCENDANTS;
     }
-
-
 }