commit eb995c7939d6c471d41e606fd3d886ba72fc1851
author Jean Chalard <jchalard@google.com> Thu May 10 00:29:21 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 10 00:29:21 2012 -0700
tree 5b16ec1d1a6d3da10e0643b98c5dcbc968606842
parent cfed94a65607fe9bb3387104c5368df31d73d04e
parent f14002ca6be3029433e25152496d6c560243ee7a

Merge "Fix a bug with a duplicate entry" into jb-dev

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

diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index d33f8c3..68b5c48 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -184,7 +184,10 @@
             // TODO: sort in unicode order
             addLocaleDisplayNameToList(activity, localesList, l);
         }
-        localesList.add(new LocaleRenderer(activity, "")); // meaning: all languages
+        if (!"".equals(mLocale)) {
+            // If mLocale is "", then we already inserted the "all languages" item, so don't do it
+            addLocaleDisplayNameToList(activity, localesList, ""); // meaning: all languages
+        }
         localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale
         return localesList;
     }