nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Remove the original text from SuggestionSpan"

Browse source
This commit is contained in:
satok 2011-06-15 02:43:03 -07:00 committed by Android (Google) Code Review
commit e968ad8ad1
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
View file

@ -23,8 +23,10 @@ import android.content.Context;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
public class SuggestionSpanUtils { public class SuggestionSpanUtils {
@ -33,6 +35,7 @@ public class SuggestionSpanUtils {
public static final String SUGGESTION_SPAN_PICKED_AFTER = "after"; public static final String SUGGESTION_SPAN_PICKED_AFTER = "after";
public static final String SUGGESTION_SPAN_PICKED_BEFORE = "before"; public static final String SUGGESTION_SPAN_PICKED_BEFORE = "before";
public static final String SUGGESTION_SPAN_PICKED_HASHCODE = "hashcode"; public static final String SUGGESTION_SPAN_PICKED_HASHCODE = "hashcode";
public static final int SUGGESTION_MAX_SIZE = 5;
private static final Class<?> CLASS_SuggestionSpan = CompatUtils private static final Class<?> CLASS_SuggestionSpan = CompatUtils
.getClass("android.text.style.SuggestionSpan"); .getClass("android.text.style.SuggestionSpan");
@ -48,8 +51,8 @@ public class SuggestionSpanUtils {
public static CharSequence getTextWithSuggestionSpan(Context context, public static CharSequence getTextWithSuggestionSpan(Context context,
CharSequence suggestion, SuggestedWords suggestedWords) { CharSequence suggestion, SuggestedWords suggestedWords) {
if (CONSTRUCTOR_SuggestionSpan == null || suggestedWords == null if (TextUtils.isEmpty(suggestion) || CONSTRUCTOR_SuggestionSpan == null
|| suggestedWords.size() == 0) { || suggestedWords == null || suggestedWords.size() == 0) {
return suggestion; return suggestion;
} }
@ -59,14 +62,19 @@ public class SuggestionSpanUtils {
} else { } else {
spannable = new SpannableString(suggestion); spannable = new SpannableString(suggestion);
} }
// TODO: Use SUGGESTIONS_MAX_SIZE instead of 5. final ArrayList<String> suggestionsList = new ArrayList<String>();
final int N = Math.min(5, suggestedWords.size()); for (int i = 0; i < suggestedWords.size(); ++i) {
final String[] suggestionsArray = new String[N]; if (suggestionsList.size() >= SUGGESTION_MAX_SIZE) {
for (int i = 0; i < N; ++i) { break;
suggestionsArray[i] = suggestedWords.getWord(i).toString(); }
final CharSequence word = suggestedWords.getWord(i);
if (!TextUtils.equals(suggestion, word)) {
suggestionsList.add(word.toString());
}
} }
final Object[] args = final Object[] args =
{ context, null, suggestionsArray, 0, { context, null, suggestionsList.toArray(new String[suggestionsList.size()]), 0,
(Class<?>) SuggestionSpanPickedNotificationReceiver.class }; (Class<?>) SuggestionSpanPickedNotificationReceiver.class };
final Object ss = CompatUtils.newInstance(CONSTRUCTOR_SuggestionSpan, args); final Object ss = CompatUtils.newInstance(CONSTRUCTOR_SuggestionSpan, args);
if (ss == null) { if (ss == null) {