Projects >> platform_frameworks_base >>a20e87347605a625d557c4b9c721fb2e560573ee

Chunk
Conflicting content 
        Selection.setSelection((Spannable) mText, selectionStart, selectionEnd);
    }
<<<<<<< HEAD

=======
    
    private String getWordForDictionary() {
        if (!mContextMenuTriggeredByKey) {
            moveCursorToLastTapPosition();
        }
        long wordLimits = getWordLimitsAt(getSelectionStart());
        if (wordLimits >= 0) {
            int start = extractRangeStartFromLong(wordLimits);
            int end = extractRangeEndFromLong(wordLimits);
            return mTransformed.subSequence(start, end).toString();
        } else {
            return null;
        }
    }
    
>>>>>>> d7d47941a92137fa5c1ba04ba67ad87911347b6b
    @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
Chunk
Conflicting content 
                menu.add(0, ID_CUT, 0, com.android.internal.R.string.cut).
        // it may not be called (if the user/ discards the context menu with the back key).
        mDPadCenterIsDown = mEnterKeyIsDown = false;

<<<<<<< HEAD
        MenuHandler handler = new MenuHandler();
=======
        if (mIsInTextSelectionMode) {
            MenuHandler handler = new MenuHandler();
            
            if (canCut()) {
                     setOnMenuItemClickListener(handler).
                     setAlphabeticShortcut('x');
                added = true;
            }

            if (canCopy()) {
                menu.add(0, ID_COPY, 0, com.android.internal.R.string.copy).
                     setOnMenuItemClickListener(handler).
                     setAlphabeticShortcut('c');
                added = true;
            }

            if (canPaste()) {
                menu.add(0, ID_PASTE, 0, com.android.internal.R.string.paste).
                     setOnMenuItemClickListener(handler).
                     setAlphabeticShortcut('v');
                added = true;
            }
        } else {
            MenuHandler handler = new MenuHandler();
>>>>>>> d7d47941a92137fa5c1ba04ba67ad87911347b6b

        if (mText instanceof Spanned) {
            int selStart = getSelectionStart();
Solution content 
        // it may not be called (if the user/ discards the context menu with the back key).
        mDPadCenterIsDown = mEnterKeyIsDown = false;

        MenuHandler handler = new MenuHandler();

        if (mText instanceof Spanned) {
            int selStart = getSelectionStart();
File
TextView.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
                }
                return true;

<<<<<<< HEAD
            case ID_SELECTION_MODE:
                startSelectionActionMode();
=======
            case ID_ADD_TO_DICTIONARY:
                String word = getWordForDictionary();
                if (word != null) {
                    Intent i = new Intent("com.android.settings.USER_DICTIONARY_INSERT");
                    i.putExtra("word", word);
                    i.setFlags(i.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
                    getContext().startActivity(i);
                }
>>>>>>> d7d47941a92137fa5c1ba04ba67ad87911347b6b
                return true;
            }
Solution content 
                }
                return true;

            case ID_SELECTION_MODE:
                startSelectionActionMode();
                return true;
            }
File
TextView.java
Developer's decision
Version 1
Kind of conflict
Case statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
    // Cursor Controllers. Null when disabled.
    private CursorController        mInsertionPointCursorController;
    private CursorController        mSelectionModifierCursorController;
<<<<<<< HEAD
    private ActionMode              mSelectionActionMode;
    private int                     mLastTouchOffset = -1;
=======
    private boolean                 mIsInTextSelectionMode = false;
>>>>>>> d7d47941a92137fa5c1ba04ba67ad87911347b6b
    // These are needed to desambiguate a long click. If the long click comes from ones of these, we
    // select from the current cursor position. Otherwise, select from long pressed position.
    private boolean                 mDPadCenterIsDown = false;
Solution content 
    // Cursor Controllers. Null when disabled.
    private CursorController        mInsertionPointCursorController;
    private CursorController        mSelectionModifierCursorController;
    private ActionMode              mSelectionActionMode;
    // These are needed to desambiguate a long click. If the long click comes from ones of these, we
    // select from the current cursor position. Otherwise, select from long pressed position.
    private boolean                 mDPadCenterIsDown = false;
File
TextView.java
Developer's decision
Combination
Kind of conflict
Attribute