Projects >> android-frameworks-base-with-remote-control-service >>ad7ab8be4774a4fbb01a50deed52e819549327a7

Chunk
Conflicting content
        nativeMotionUp(x, y, mNavSlop);
    }

<<<<<<< HEAD
    /**
     * Called when pressing the center key or trackball on a textfield.
     */
    /*package*/ void centerKeyPressOnTextField() {
        mWebViewCore.sendMessage(EventHub.CLICK, nativeCursorFramePointer(),
                    nativeCursorNodePointer());
        // Need to show the soft keyboard if it's not readonly.
        if (!nativeCursorIsReadOnly()) {
            displaySoftKeyboard(true);
=======
    /*package*/ void shortPressOnTextField() {
        if (inEditingMode()) {
            View v = mWebTextView;
            int x = viewToContentX((v.getLeft() + v.getRight()) >> 1);
            int y = viewToContentY((v.getTop() + v.getBottom()) >> 1);
            displaySoftKeyboard(true);
            nativeTextInputMotionUp(x, y);
>>>>>>> db08d5cd441424e4f9621aae7c2414934f781400
        }
    }
Solution content
    /**
        nativeMotionUp(x, y, mNavSlop);
    }
     * Called when pressing the center key or trackball on a textfield.
     */
    /*package*/ void centerKeyPressOnTextField() {
        mWebViewCore.sendMessage(EventHub.CLICK, nativeCursorFramePointer(),
                    nativeCursorNodePointer());
        // Need to show the soft keyboard if it's not readonly.
        if (!nativeCursorIsReadOnly()) {
            displaySoftKeyboard(true);
        }
    }
File
WebView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
If statement
Method invocation
Method signature
Variable