commit 1ccd78cd6877116a81a37046a101af01e53fb8f3
author Satoshi Kataoka <satok@google.com> Tue Jul 30 03:52:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 30 03:52:42 2013 +0000
tree be1bbba31c5d19a7a9cb531bca63685554b962c7
parent 7e9d6a8e558ad9208499bc4b6b83fc8f1649ad17
parent 4b6603cb7981d99a6609a7de610d1f2c35f47074

Merge "Fix the displayed name of the personal dictionary"

src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java

diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index 8f7029a..86c3e79 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -27,7 +27,6 @@
 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;

src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java

diff --git a/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
index 2238b4b..e77f9c5 100644
--- a/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
+++ b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
@@ -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 @@
  */
 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);