Merge change 2465 into donut

* changes:
  Fix crash in GestureOverlayView

1 files changed, 17 insertions, 13 deletions

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index ccb876f..e896d58 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -755,19 +755,21 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
             if (ev.getAction() != MotionEvent.ACTION_DOWN || mFastScroller == null ||
                     !mFastScroller.isPointInside(ev.getX(), ev.getY())) {
 
-                mGesturesOverlay.dispatchTouchEvent(ev);
-
-                final boolean isGesturing = mGesturesOverlay.isGesturing();
-
-                if (!isGesturing) {
-                    mPreviousGesturing = isGesturing;
-                    return super.dispatchTouchEvent(ev);
-                } else if (!mPreviousGesturing){
-                    mPreviousGesturing = isGesturing;
-                    final MotionEvent event = MotionEvent.obtain(ev);
-                    event.setAction(MotionEvent.ACTION_CANCEL);
-                    super.dispatchTouchEvent(event);
-                    return true;
+                if (mGesturesPopup.isShowing()) {
+                    mGesturesOverlay.dispatchTouchEvent(ev);
+
+                    final boolean isGesturing = mGesturesOverlay.isGesturing();
+
+                    if (!isGesturing) {
+                        mPreviousGesturing = isGesturing;
+                        return super.dispatchTouchEvent(ev);
+                    } else if (!mPreviousGesturing){
+                        mPreviousGesturing = isGesturing;
+                        final MotionEvent event = MotionEvent.obtain(ev);
+                        event.setAction(MotionEvent.ACTION_CANCEL);
+                        super.dispatchTouchEvent(event);
+                        return true;
+                    }
                 }
             }
         }
@@ -1927,6 +1929,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
             final int longPressPosition, final long longPressId) {
         boolean handled = false;
 
+        dismissGesturesPopup();
+        
         if (mOnItemLongClickListener != null) {
             handled = mOnItemLongClickListener.onItemLongClick(AbsListView.this, child,
                     longPressPosition, longPressId);