Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a10808d7 authored by Dan Zivkovic's avatar Dan Zivkovic Committed by Android (Google) Code Review
Browse files

Merge "Remove rejected suggestion in LatinIME."

parents 320cef5f 8844c35e

java-overridable/src/com/android/inputmethod/latin/define/DecoderSpecificConstants.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

java/src/com/android/inputmethod/latin/Suggest.java

+5 −2
Original line number Diff line number Diff line
@@ -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,7 +312,9 @@ public final class Suggest { 
            }

        }



        if (suggestionsContainer.size() > 1 && TextUtils.equals(suggestionsContainer.get(0).mWord,

        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);