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

Commit 19bfef6c authored by Jean Chalard's avatar Jean Chalard
Browse files

Use the new Utils.setSystemLocale method in the new code. 

The change list that introduced this code was created at the same
time as the one that introduced the Utils.setSystemLocale method
and didn't use it yet. Fix this.

Change-Id: Ifdd2ad9f7dbb7f300bc255bc2e035ae893a9d410
parent 4250eb27

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

+3 −7
Original line number Diff line number Diff line
@@ -124,13 +124,10 @@ public class DictionaryFactory { 
     */

    public static boolean isDictionaryAvailable(Context context, Locale locale) {

        final Resources res = context.getResources();

        final Configuration conf = res.getConfiguration();

        final Locale saveLocale = conf.locale;

        conf.locale = locale;

        res.updateConfiguration(conf, res.getDisplayMetrics());

        final Locale saveLocale = Utils.setSystemLocale(res, locale);



        final int resourceId = Utils.getMainDictionaryResourceId(res);

        final AssetFileDescriptor afd = context.getResources().openRawResourceFd(resourceId);

        final AssetFileDescriptor afd = res.openRawResourceFd(resourceId);

        final boolean hasDictionary = isFullDictionary(afd);

        try {

            if (null != afd) afd.close();
@@ -138,8 +135,7 @@ public class DictionaryFactory { 
            /* Um, what can we do here exactly? */

        }



        conf.locale = saveLocale;

        res.updateConfiguration(conf, res.getDisplayMetrics());

        Utils.setSystemLocale(res, saveLocale);

        return hasDictionary;

    }