Merge "Stop offering "Replace..." when there are no suggestions." into mnc-dev (4186b1d4) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -1843,12 +1843,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]);
		@@ -1858,11 +1864,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;