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

am a905fcec: [IL16] Improve getTextWithSuggestionSpan 

* commit 'a905fcec00f78e828c1fe9109f27cc9f149941b5':
  [IL16] Improve getTextWithSuggestionSpan
main
Jean Chalard 2013-12-19 22:27:10 -08:00 committed by Android Git Automerger
parent 91000283b5 a905fcec00
commit e3e80aa107
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
View File

@ -23,8 +23,10 @@ import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.SuggestionSpan;
import com.android.inputmethod.latin.Dictionary;
import com.android.inputmethod.latin.LatinImeLogger;
import com.android.inputmethod.latin.SuggestedWords;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import com.android.inputmethod.latin.SuggestionSpanPickedNotificationReceiver;
import com.android.inputmethod.latin.utils.CollectionUtils;
@ -66,30 +68,42 @@ public final class SuggestionSpanUtils {
}
public static CharSequence getTextWithSuggestionSpan(final Context context,
final String pickedWord, final SuggestedWords suggestedWords,
final boolean dictionaryAvailable) {
if (!dictionaryAvailable || TextUtils.isEmpty(pickedWord) || suggestedWords.isEmpty()
final String pickedWord, final SuggestedWords suggestedWords) {
if (TextUtils.isEmpty(pickedWord) || suggestedWords.isEmpty()
|| suggestedWords.mIsPrediction || suggestedWords.mIsPunctuationSuggestions) {
return pickedWord;
}
final Spannable spannable = new SpannableString(pickedWord);
boolean hasSuggestionFromMainDictionary = false;
final ArrayList<String> suggestionsList = CollectionUtils.newArrayList();
for (int i = 0; i < suggestedWords.size(); ++i) {
if (suggestionsList.size() >= SuggestionSpan.SUGGESTIONS_MAX_SIZE) {
break;
}
final SuggestedWordInfo info = suggestedWords.getInfo(i);
if (info.mKind == SuggestedWordInfo.KIND_PREDICTION) {
continue;
}
if (info.mSourceDict.mDictType == Dictionary.TYPE_MAIN) {
hasSuggestionFromMainDictionary = true;
}
final String word = suggestedWords.getWord(i);
if (!TextUtils.equals(pickedWord, word)) {
suggestionsList.add(word.toString());
}
}
if (!hasSuggestionFromMainDictionary) {
// If we don't have any suggestions from the dictionary, it probably looks bad
// enough as it is already because suggestions come pretty much only from contacts.
// Let's not embed these bad suggestions in the text view so as to avoid using
// them with recorrection.
return pickedWord;
}
// TODO: We should avoid adding suggestion span candidates that came from the bigram
// prediction.
final SuggestionSpan suggestionSpan = new SuggestionSpan(context, null /* locale */,
suggestionsList.toArray(new String[suggestionsList.size()]), 0 /* flags */,
SuggestionSpanPickedNotificationReceiver.class);
final Spannable spannable = new SpannableString(pickedWord);
spannable.setSpan(suggestionSpan, 0, pickedWord.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable;
}

2
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -2026,7 +2026,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final String separatorString) {
final SuggestedWords suggestedWords = mInputLogic.mSuggestedWords;
mInputLogic.mConnection.commitText(SuggestionSpanUtils.getTextWithSuggestionSpan(
this, chosenWord, suggestedWords, mIsMainDictionaryAvailable), 1);
this, chosenWord, suggestedWords), 1);
// Add the word to the user history dictionary
final String prevWord = addToUserHistoryDictionary(chosenWord);
// TODO: figure out here if this is an auto-correct or if the best word is actually