Merge "Stop rejecting valid flings in quick contacts" into lmp-mr1-dev

    @Override

    public boolean onInterceptTouchEvent(MotionEvent event) {

        if (mVelocityTracker == null) {

            mVelocityTracker = VelocityTracker.obtain();

        }

        mVelocityTracker.addMovement(event);

        // The only time we want to intercept touch events is when we are being dragged.

        return shouldStartDrag(event);

    }

    }

    private boolean motionShouldStartDrag(MotionEvent event) {

        final float deltaX = event.getX() - mLastEventPosition[0];

        final float deltaY = event.getY() - mLastEventPosition[1];

        final boolean draggedX = (deltaX > mTouchSlop || deltaX < -mTouchSlop);

        final boolean draggedY = (deltaY > mTouchSlop || deltaY < -mTouchSlop);

        return draggedY && !draggedX;

        return deltaY > mTouchSlop || deltaY < -mTouchSlop;

    }

    private float updatePositionAndComputeDelta(MotionEvent event) {