Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9762b533 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 2465 into donut

* changes:
  Fix crash in GestureOverlayView
parents cf2119a9 fea57edf
Loading
Loading
Loading
Loading
+17 −13
Original line number Diff line number Diff line
@@ -755,6 +755,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
            if (ev.getAction() != MotionEvent.ACTION_DOWN || mFastScroller == null ||
                    !mFastScroller.isPointInside(ev.getX(), ev.getY())) {

                if (mGesturesPopup.isShowing()) {
                    mGesturesOverlay.dispatchTouchEvent(ev);

                    final boolean isGesturing = mGesturesOverlay.isGesturing();
@@ -771,6 +772,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                    }
                }
            }
        }

        return super.dispatchTouchEvent(ev);
    }
@@ -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);