Projects >> android-frameworks-base-with-remote-control-service >>9a9849ac7f20923af705887099696721c58207e6

Chunk
Conflicting content 
                    final int deltaX = (int) (mLastMotionX - x);
                    mLastMotionX = x;

<<<<<<< HEAD
                    scrollBy(deltaX, 0);
=======
                    final int oldX = mScrollX;
                    final int oldY = mScrollY;
                    final int range = getScrollRange();
                    if (overScrollBy(deltaX, 0, mScrollX, 0, range, 0,
                            mOverscrollDistance, 0, true)) {
                        // Break our velocity if we hit a scroll barrier.
                        mVelocityTracker.clear();
                    }
                    onScrollChanged(mScrollX, mScrollY, oldX, oldY);

                    final int overscrollMode = getOverScrollMode();
                    if (overscrollMode == OVER_SCROLL_ALWAYS ||
                            (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) {
                        final int pulledToX = oldX + deltaX;
                        if (pulledToX < 0) {
                            mEdgeGlowLeft.onPull((float) deltaX / getWidth());
                            if (!mEdgeGlowRight.isFinished()) {
                                mEdgeGlowRight.onRelease();
                            }
                        } else if (pulledToX > range) {
                            mEdgeGlowRight.onPull((float) deltaX / getWidth());
                            if (!mEdgeGlowLeft.isFinished()) {
                                mEdgeGlowLeft.onRelease();
                            }
                        }
                        if (mEdgeGlowLeft != null
                                && (!mEdgeGlowLeft.isFinished() || !mEdgeGlowRight.isFinished())) {
                            invalidate();
                        }
                    }
>>>>>>> 62ad0db62393073a8cda9b21e4ae1506954c10a5
                }
                break;
            case MotionEvent.ACTION_UP:
Solution content 
                    final int deltaX = (int) (mLastMotionX - x);
                    mLastMotionX = x;

                    scrollBy(deltaX, 0);
                }
                break;
            case MotionEvent.ACTION_UP:
File
HorizontalScrollView.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
                        if (pulledToY < 0) {
                    final int deltaY = (int) (mLastMotionY - y);
                    mLastMotionY = y;

<<<<<<< HEAD
                    scrollBy(0, deltaY);
=======
                    final int oldX = mScrollX;
                    final int oldY = mScrollY;
                    final int range = getScrollRange();
                    if (overScrollBy(0, deltaY, 0, mScrollY, 0, range,
                            0, mOverscrollDistance, true)) {
                        // Break our velocity if we hit a scroll barrier.
                        mVelocityTracker.clear();
                    }
                    onScrollChanged(mScrollX, mScrollY, oldX, oldY);

                    final int overscrollMode = getOverScrollMode();
                    if (overscrollMode == OVER_SCROLL_ALWAYS ||
                            (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) {
                        final int pulledToY = oldY + deltaY;
                            mEdgeGlowTop.onPull((float) deltaY / getHeight());
                            if (!mEdgeGlowBottom.isFinished()) {
                                mEdgeGlowBottom.onRelease();
                            }
                        } else if (pulledToY > range) {
                            mEdgeGlowBottom.onPull((float) deltaY / getHeight());
                            if (!mEdgeGlowTop.isFinished()) {
                                mEdgeGlowTop.onRelease();
                            }
                        }
                        if (mEdgeGlowTop != null
                                && (!mEdgeGlowTop.isFinished() || !mEdgeGlowBottom.isFinished())) {
                            invalidate();
                        }
                    }
>>>>>>> 62ad0db62393073a8cda9b21e4ae1506954c10a5
                }
                break;
            case MotionEvent.ACTION_UP:
Solution content 
                    final int deltaY = (int) (mLastMotionY - y);
                    mLastMotionY = y;

                    scrollBy(0, deltaY);
                }
                break;
            case MotionEvent.ACTION_UP:
File
ScrollView.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable