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

Commit 0c60d7c1 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android Git Automerger
Browse files

am 0e74d71f: am a848c094: Merge "Rename distracter filter class." into lmp-dev 

* commit '0e74d71f':
  Rename distracter filter class.
parents 9306c027 0e74d71f

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

+3 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ import com.android.inputmethod.latin.utils.ApplicationUtils; 
import com.android.inputmethod.latin.utils.CapsModeUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.DialogUtils;

import com.android.inputmethod.latin.utils.DistracterFilterCheckingExactMatches;

import com.android.inputmethod.latin.utils.DistracterFilterCheckingExactMatchesAndSuggestions;

import com.android.inputmethod.latin.utils.ImportantNoticeUtils;

import com.android.inputmethod.latin.utils.IntentUtils;

import com.android.inputmethod.latin.utils.JniUtils;
@@ -126,7 +126,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 


    private final Settings mSettings;

    private final DictionaryFacilitator mDictionaryFacilitator =

            new DictionaryFacilitator(new DistracterFilterCheckingExactMatches(this /* context */));

            new DictionaryFacilitator(

                    new DistracterFilterCheckingExactMatchesAndSuggestions(this /* context */));

    // TODO: Move from LatinIME.

    private final PersonalizationDictionaryUpdater mPersonalizationDictionaryUpdater =

            new PersonalizationDictionaryUpdater(this /* context */, mDictionaryFacilitator);

java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatches.java→java/src/com/android/inputmethod/latin/utils/DistracterFilterCheckingExactMatchesAndSuggestions.java

+4 −3
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion; 
 * This class is used to prevent distracters being added to personalization

 * or user history dictionaries

 */

public class DistracterFilterCheckingExactMatches implements DistracterFilter {

    private static final String TAG = DistracterFilterCheckingExactMatches.class.getSimpleName();

public class DistracterFilterCheckingExactMatchesAndSuggestions implements DistracterFilter {

    private static final String TAG =

            DistracterFilterCheckingExactMatchesAndSuggestions.class.getSimpleName();

    private static final boolean DEBUG = false;



    private static final long TIMEOUT_TO_WAIT_LOADING_DICTIONARIES_IN_SECONDS = 120;
@@ -70,7 +71,7 @@ public class DistracterFilterCheckingExactMatches implements DistracterFilter { 
     *

     * @param context the context.

     */

    public DistracterFilterCheckingExactMatches(final Context context) {

    public DistracterFilterCheckingExactMatchesAndSuggestions(final Context context) {

        mContext = context;

        mLocaleToSubtypeMap = new HashMap<>();

        mLocaleToKeyboardMap = new HashMap<>();

tests/src/com/android/inputmethod/latin/DistracterFilterTest.java

+3 −3
Original line number Diff line number Diff line
@@ -24,20 +24,20 @@ import android.test.AndroidTestCase; 
import android.test.suitebuilder.annotation.LargeTest;

import android.view.inputmethod.InputMethodSubtype;



import com.android.inputmethod.latin.utils.DistracterFilterCheckingExactMatches;

import com.android.inputmethod.latin.utils.DistracterFilterCheckingExactMatchesAndSuggestions;



/**

 * Unit test for DistracterFilter

 */

@LargeTest

public class DistracterFilterTest extends AndroidTestCase {

    private DistracterFilterCheckingExactMatches mDistracterFilter;

    private DistracterFilterCheckingExactMatchesAndSuggestions mDistracterFilter;



    @Override

    protected void setUp() throws Exception {

        super.setUp();

        final Context context = getContext();

        mDistracterFilter = new DistracterFilterCheckingExactMatches(context);

        mDistracterFilter = new DistracterFilterCheckingExactMatchesAndSuggestions(context);

        RichInputMethodManager.init(context);

        final RichInputMethodManager richImm = RichInputMethodManager.getInstance();

        final ArrayList<InputMethodSubtype> subtypes = new ArrayList<>();