Projects >> platform_frameworks_base >>7499a1ca68ba115efcf53f6a06520c579c44364d

Chunk
Conflicting content 
            minOffset = selectionModifierCursorController.getMinTouchOffset();
            maxOffset = selectionModifierCursorController.getMaxTouchOffset();
        }
<<<<<<< HEAD

        int selectionStart, selectionEnd;

=======

        int selectionStart, selectionEnd;
        
>>>>>>> 5d1465490c1b2c18b5425cfc14b405f45b61e281
        long wordLimits = getWordLimitsAt(minOffset);
        if (wordLimits >= 0) {
            selectionStart = extractRangeStartFromLong(wordLimits);
Solution content 
            minOffset = selectionModifierCursorController.getMinTouchOffset();
            maxOffset = selectionModifierCursorController.getMaxTouchOffset();
        }

        int selectionStart, selectionEnd;

        long wordLimits = getWordLimitsAt(minOffset);
        if (wordLimits >= 0) {
            selectionStart = extractRangeStartFromLong(wordLimits);
File
TextView.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
        Selection.setSelection((Spannable) mText, selectionStart, selectionEnd);
    }
<<<<<<< HEAD

=======
    
    private String getWordForDictionary() {
        long wordLimits = getWordLimitsAt(getSelectionStart());
        if (wordLimits >= 0) {
            int start = extractRangeStartFromLong(wordLimits);
            int end = extractRangeEndFromLong(wordLimits);
            return mTransformed.subSequence(start, end).toString();
        } else {
            return null;
        }
    }
    
>>>>>>> 5d1465490c1b2c18b5425cfc14b405f45b61e281
    @Override
    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
        if (!isShown()) {
Solution content 
        Selection.setSelection((Spannable) mText, selectionStart, selectionEnd);
    }

    @Override
    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
        if (!isShown()) {
File
TextView.java
Developer's decision
Version 1
Kind of conflict
Method declaration