Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e4fbe03 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Stop offering "Replace..." when there are no suggestions. 

Suggestions in a suggestion span can be empty. When all
suggestion spans don't have any suggestions, we shouldn't
offer to show suggestions.

Bug: 21046505
Change-Id: I48a1e19b176769743ad14c5109e4cb3fc9416393
parent 1c861591

core/java/android/widget/Editor.java

+12 −1
Original line number Diff line number Diff line
@@ -1806,12 +1806,18 @@ public class Editor { 
        }

        if (selectionStart == selectionEnd) {

            // Spans overlap the cursor.

            for (int i = 0; i < suggestionSpans.length; i++) {

                if (suggestionSpans[i].getSuggestions().length > 0) {

                    return true;

                }

            }

            return false;

        }

        int minSpanStart = mTextView.getText().length();

        int maxSpanEnd = 0;

        int unionOfSpansCoveringSelectionStartStart = mTextView.getText().length();

        int unionOfSpansCoveringSelectionStartEnd = 0;

        boolean hasValidSuggestions = false;

        for (int i = 0; i < suggestionSpans.length; i++) {

            final int spanStart = spannable.getSpanStart(suggestionSpans[i]);

            final int spanEnd = spannable.getSpanEnd(suggestionSpans[i]);
@@ -1821,11 +1827,16 @@ public class Editor { 
                // The span doesn't cover the current selection start point.

                continue;

            }

            hasValidSuggestions =

                    hasValidSuggestions || suggestionSpans[i].getSuggestions().length > 0;

            unionOfSpansCoveringSelectionStartStart =

                    Math.min(unionOfSpansCoveringSelectionStartStart, spanStart);

            unionOfSpansCoveringSelectionStartEnd =

                    Math.max(unionOfSpansCoveringSelectionStartEnd, spanEnd);

        }

        if (!hasValidSuggestions) {

            return false;

        }

        if (unionOfSpansCoveringSelectionStartStart >= unionOfSpansCoveringSelectionStartEnd) {

            // No spans cover the selection start point.

            return false;