am a10808d7: Merge "Remove rejected suggestion in LatinIME."

* commit 'a10808d7d6ac50a93a8b7400824796a703211d01':
  Remove rejected suggestion in LatinIME.
main
Dan Zivkovic 2015-03-17 18:20:54 +00:00 committed by Android Git Automerger
commit 858d690f5d
2 changed files with 6 additions and 2 deletions

View File

@ -34,4 +34,5 @@ public class DecoderSpecificConstants {
public static final boolean SHOULD_VERIFY_CHECKSUM = true;
public static final boolean SHOULD_USE_DICT_VERSION = true;
public static final boolean SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION = false;
public static final boolean SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION = true;
}

View File

@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
import android.text.TextUtils;
import static com.android.inputmethod.latin.define.DecoderSpecificConstants.SHOULD_AUTO_CORRECT_USING_NON_WHITE_LISTED_SUGGESTION;
import static com.android.inputmethod.latin.define.DecoderSpecificConstants.SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION;
import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
@ -311,8 +312,10 @@ public final class Suggest {
}
}
if (suggestionsContainer.size() > 1 && TextUtils.equals(suggestionsContainer.get(0).mWord,
wordComposer.getRejectedBatchModeSuggestion())) {
if (SHOULD_REMOVE_PREVIOUSLY_REJECTED_SUGGESTION
&& suggestionsContainer.size() > 1
&& TextUtils.equals(suggestionsContainer.get(0).mWord,
wordComposer.getRejectedBatchModeSuggestion())) {
final SuggestedWordInfo rejected = suggestionsContainer.remove(0);
suggestionsContainer.add(1, rejected);
}