Projects >> android_frameworks_base >>dddaa56f793ad9ecb4e20df746f562ac7f24d158

Chunk
Conflicting content 
            } else if (direction == View.FOCUS_DOWN) {
                if (getChildCount() > 0) {
                    int daBottom = getChildAt(0).getBottom();
<<<<<<< HEAD

                    int screenBottom = getScrollY() + getHeight();

=======
                    int screenBottom = getScrollY() + getHeight() - mPaddingBottom;
>>>>>>> b737647db80dad073408064710d61b28890c6e98
                    if (daBottom - screenBottom < maxJump) {
                        scrollDelta = daBottom - screenBottom;
                    }
Solution content 
            } else if (direction == View.FOCUS_DOWN) {
                if (getChildCount() > 0) {
                    int daBottom = getChildAt(0).getBottom();
                    int screenBottom = getScrollY() + getHeight() - mPaddingBottom;
                    if (daBottom - screenBottom < maxJump) {
                        scrollDelta = daBottom - screenBottom;
                    }
File
ScrollView.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable