Projects >> android-frameworks-base-with-screenshot-tweaks >>959046c3aa38a99acc3f582232710ebc543d938a

Chunk
Conflicting content 
                    break;
                }
                case SWITCH_TO_LONGPRESS: {
<<<<<<< HEAD
                    mTouchMode = TOUCH_DONE_MODE;
                    performLongClick();
                    rebuildWebTextView();
=======
                    if (!mPreventDrag) {
                        mTouchMode = TOUCH_DONE_MODE;
                        performLongClick();
                        updateTextEntry();
                    }
>>>>>>> 7cb8182e36268dca8ca59d706966c43095c8baa0
                    break;
                }
                case SWITCH_TO_CLICK:
Solution content 
                    break;
                }
                case SWITCH_TO_LONGPRESS: {
                    if (!mPreventDrag) {
                        mTouchMode = TOUCH_DONE_MODE;
                        performLongClick();
                        rebuildWebTextView();
                    }
                    break;
                }
                case SWITCH_TO_CLICK:
File
WebView.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation