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

Commit f86b8309 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Prepare using dictionaryFacilitator for amanatto updates."

parents 8bd65855 c09fd175

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

+6 −2
Original line number Diff line number Diff line
@@ -524,7 +524,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        }

        if (currentSettingsValues.mUsePersonalizedDicts) {

            if (mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes()) {

                PersonalizationDictionarySessionRegistrar.init(this);

                PersonalizationDictionarySessionRegistrar.init(this,

                        mInputLogic.mSuggest.mDictionaryFacilitator);

            } else {

                PersonalizationDictionarySessionRegistrar.close(this);

            }
@@ -568,6 +569,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                new DictionaryFacilitatorForSuggest(this /* context */, subtypeLocale,

                        settingsValues, this /* DictionaryInitializationListener */,

                        oldDictionaryFacilitator);

        PersonalizationDictionarySessionRegistrar.onConfigurationChanged(

                this, getResources().getConfiguration(), dictionaryFacilitator);

        final Suggest newSuggest = new Suggest(subtypeLocale, dictionaryFacilitator);

        if (settingsValues.mCorrectionEnabled) {

            newSuggest.setAutoCorrectionThreshold(settingsValues.mAutoCorrectionThreshold);
@@ -619,7 +622,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                mOptionsDialog.dismiss();

            }

        }

        PersonalizationDictionarySessionRegistrar.onConfigurationChanged(this, conf);

        PersonalizationDictionarySessionRegistrar.onConfigurationChanged(this, conf,

                mInputLogic.mSuggest.mDictionaryFacilitator);

        super.onConfigurationChanged(conf);

    }

java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionarySessionRegistrar.java

+6 −2
Original line number Diff line number Diff line
@@ -19,11 +19,15 @@ package com.android.inputmethod.latin.personalization; 
import android.content.Context;

import android.content.res.Configuration;



import com.android.inputmethod.latin.DictionaryFacilitatorForSuggest;



public class PersonalizationDictionarySessionRegistrar {

    public static void init(final Context context) {

    public static void init(final Context context,

            final DictionaryFacilitatorForSuggest dictionaryFacilitator) {

    }



    public static void onConfigurationChanged(final Context context, final Configuration conf) {

    public static void onConfigurationChanged(final Context context, final Configuration conf,

            final DictionaryFacilitatorForSuggest dictionaryFacilitator) {

    }



    public static void onUpdateData(final Context context, final String type) {