From 8844c35e7ed4a04cefaaeae09a74e35be5cae71b Mon Sep 17 00:00:00 2001 From: Dan Zivkovic Date: Mon, 16 Mar 2015 18:26:37 -0700 Subject: [PATCH] Remove rejected suggestion in LatinIME. Bug 19744396. Change-Id: I64e59b3fb1ab627c70bf27a12a78d8d927da7e97 --- .../inputmethod/latin/define/DecoderSpecificConstants.java | 1 + java/src/com/android/inputmethod/latin/Suggest.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java b/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java index a82abdbc1..7f57ce858 100644 --- a/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java +++ b/java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java @@ -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; } diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 660b64cdf..8562acd83 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -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); }