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

Commit 4b6603cb authored by Satoshi Kataoka's avatar Satoshi Kataoka
Browse files

Fix the displayed name of the personal dictionary

Bug: 8976598
Change-Id: I3a8b50790b6da1658f32ff89df222127cb310da6
parent 84bbb548
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Spinner;

import com.android.settings.R;
import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
+7 −0
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@

package com.android.settings.inputmethod;

import com.android.settings.R;
import com.android.settings.Utils;

import android.content.Context;
import android.text.TextUtils;

import java.util.Locale;

@@ -27,6 +29,11 @@ import java.util.Locale;
 */
public class UserDictionarySettingsUtils {
    public static String getLocaleDisplayName(Context context, String localeStr) {
        if (TextUtils.isEmpty(localeStr)) {
            // CAVEAT: localeStr should not be null because a null locale stands for the system
            // locale in UserDictionary.Words.addWord.
            return context.getResources().getString(R.string.user_dict_settings_all_languages);
        }
        final Locale locale = Utils.createLocaleFromString(localeStr);
        final Locale systemLocale = context.getResources().getConfiguration().locale;
        return locale.getDisplayName(systemLocale);