Projects >> platform_frameworks_base >>843ff92bb0f2ff259145fd90333b0a50d8bbf342

Chunk
Conflicting content 
            return superResult;
        }

<<<<<<< HEAD
        if ((mMovement != null || onCheckIsTextEditor()) && mText instanceof Spannable && mLayout != null) {
            if (mInsertionPointCursorController != null) {
                mInsertionPointCursorController.onTouchEvent(event);
            }
            if (mSelectionModifierCursorController != null) {
                mSelectionModifierCursorController.onTouchEvent(event);
            }

=======
        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
                && mText instanceof Spannable && mLayout != null) {
            
>>>>>>> 5d919b4387488d2420cb14b4f9ba3fd158efa3cc
            boolean handled = false;

            // Save previous selection, in case this event is used to show the IME.
Solution content 
            return superResult;
        }

        if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
                && mText instanceof Spannable && mLayout != null) {
            if (mInsertionPointCursorController != null) {
                mInsertionPointCursorController.onTouchEvent(event);
            }
            if (mSelectionModifierCursorController != null) {
                mSelectionModifierCursorController.onTouchEvent(event);
            }

            boolean handled = false;

            // Save previous selection, in case this event is used to show the IME.
File
TextView.java
Developer's decision
Combination
Kind of conflict
If statement