Projects >> android-frameworks-base-with-screenshot-tweaks >>f9bb1cd1fcff7079445dae494ce5d56276092c11

Chunk
Conflicting content 
<<<<<<< HEAD
        SuggestionSpan suggestionSpan = new SuggestionSpan(mTextView.getContext(), suggestions,
                SuggestionSpan.FLAG_EASY_CORRECT | SuggestionSpan.FLAG_MISSPELLED);
        editable.setSpan(suggestionSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
=======

        mTextView.invalidateRegion(start, end);
>>>>>>> fb72920209fb1bc13d7df257951b021d022e50d8
    }

    private class SpellParser {
Solution content 
        SuggestionSpan suggestionSpan = new SuggestionSpan(mTextView.getContext(), suggestions,
                SuggestionSpan.FLAG_EASY_CORRECT | SuggestionSpan.FLAG_MISSPELLED);
        editable.setSpan(suggestionSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

        mTextView.invalidateRegion(start, end);
    }

    private class SpellParser {
File
SpellChecker.java
Developer's decision
Version 2
Kind of conflict
Method invocation