Merge "Spell checker underlines words even when there are no suggestions" into jb-dev (12ff1492) · Commits · e / os / android_frameworks_base

core/java/android/widget/SpellChecker.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -427,12 +427,6 @@ public class SpellChecker implements SpellCheckerSessionListener {
		if (spellCheckSpanStart < 0 \|\| spellCheckSpanEnd <= spellCheckSpanStart)
		return; // span was removed in the meantime

		final int suggestionsCount = suggestionsInfo.getSuggestionsCount();
		if (suggestionsCount <= 0) {
		// A negative suggestion count is possible
		return;
		}

		final int start;
		final int end;
		if (offset != USE_SPAN_RANGE && length != USE_SPAN_RANGE) {
		@@ -443,17 +437,23 @@ public class SpellChecker implements SpellCheckerSessionListener {
		end = spellCheckSpanEnd;
		}

		String[] suggestions = new String[suggestionsCount];
		final int suggestionsCount = suggestionsInfo.getSuggestionsCount();
		String[] suggestions;
		if (suggestionsCount > 0) {
		suggestions = new String[suggestionsCount];
		for (int i = 0; i < suggestionsCount; i++) {
		suggestions[i] = suggestionsInfo.getSuggestionAt(i);
		}
		} else {
		suggestions = ArrayUtils.emptyArray(String.class);
		}

		SuggestionSpan suggestionSpan = new SuggestionSpan(mTextView.getContext(), suggestions,
		SuggestionSpan.FLAG_EASY_CORRECT \| SuggestionSpan.FLAG_MISSPELLED);
		// TODO: Remove mIsSentenceSpellCheckSupported by extracting an interface
		// to share the logic of word level spell checker and sentence level spell checker
		if (mIsSentenceSpellCheckSupported) {
		final long key = TextUtils.packRangeInLong(start, end);
		final Long key = Long.valueOf(TextUtils.packRangeInLong(start, end));
		final SuggestionSpan tempSuggestionSpan = mSuggestionSpanCache.get(key);
		if (tempSuggestionSpan != null) {
		if (DBG) {