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

Commit 817cd9a0 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Use different user dict name for spell checker. 

Bug: 13630847
Change-Id: Icabd08c674dcf086250b9e594328a43286d1d203
parent 60763a06

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

+6 −1
Original line number Diff line number Diff line
@@ -86,7 +86,12 @@ public class UserBinaryDictionary extends ExpandableBinaryDictionary { 


    public UserBinaryDictionary(final Context context, final Locale locale,

            final boolean alsoUseMoreRestrictiveLocales, final File dictFile) {

        super(context, getDictName(NAME, locale, dictFile), locale, Dictionary.TYPE_USER, dictFile);

        this(context, locale, alsoUseMoreRestrictiveLocales, dictFile, NAME);

    }



    protected UserBinaryDictionary(final Context context, final Locale locale,

            final boolean alsoUseMoreRestrictiveLocales, final File dictFile, final String name) {

        super(context, getDictName(name, locale, dictFile), locale, Dictionary.TYPE_USER, dictFile);

        if (null == locale) throw new NullPointerException(); // Catch the error earlier

        final String localeStr = locale.toString();

        if (SubtypeLocaleUtils.NO_LANGUAGE.equals(localeStr)) {

java/src/com/android/inputmethod/latin/spellcheck/SynchronouslyLoadedUserBinaryDictionary.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import java.util.ArrayList; 
import java.util.Locale;



public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDictionary {

    private static final String NAME = "spellcheck_user";

    private final Object mLock = new Object();



    public SynchronouslyLoadedUserBinaryDictionary(final Context context, final Locale locale) {
@@ -35,7 +36,7 @@ public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDic 


    public SynchronouslyLoadedUserBinaryDictionary(final Context context, final Locale locale,

            final boolean alsoUseMoreRestrictiveLocales) {

        super(context, locale, alsoUseMoreRestrictiveLocales, null /* dictFile */);

        super(context, locale, alsoUseMoreRestrictiveLocales, null /* dictFile */, NAME);

    }



    @Override