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

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

Merge "Use different user dict name for spell checker."

parents a5202c71 817cd9a0

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

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




    public UserBinaryDictionary(final Context context, final Locale locale,

    public UserBinaryDictionary(final Context context, final Locale locale,

            final boolean alsoUseMoreRestrictiveLocales, final File dictFile) {

            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

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

        final String localeStr = locale.toString();

        final String localeStr = locale.toString();

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

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

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

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

import java.util.Locale;





public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDictionary {

public final class SynchronouslyLoadedUserBinaryDictionary extends UserBinaryDictionary {

    private static final String NAME = "spellcheck_user";

    private final Object mLock = new Object();

    private final Object mLock = new Object();





    public SynchronouslyLoadedUserBinaryDictionary(final Context context, final Locale locale) {

    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,

    public SynchronouslyLoadedUserBinaryDictionary(final Context context, final Locale locale,

            final boolean alsoUseMoreRestrictiveLocales) {

            final boolean alsoUseMoreRestrictiveLocales) {

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

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

    }

    }





    @Override

    @Override