commit 35daf4007c8fdea451f40f92673cc94568102b2f
author Jean Chalard <jchalard@google.com> Fri Jun 10 02:34:05 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 10 02:34:05 2011 -0700
tree c84bef59ac6da15b0d27b7d67f1b187cdb46cae3
parent dc05c6650e02222686bae9fa05aad9030c11453b
parent 1ea78d92e6c148f28326f475373fb40e65350909

Merge "Stop using raw e-mail addresses as names in contacts dict."

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

diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionary.java b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
index 8049504..66a0415 100644
--- a/java/src/com/android/inputmethod/latin/ContactsDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
@@ -114,7 +114,7 @@
                 while (!cursor.isAfterLast()) {
                     String name = cursor.getString(INDEX_NAME);
 
-                    if (name != null) {
+                    if (name != null && -1 == name.indexOf('@')) {
                         int len = name.length();
                         String prevWord = null;
 
@@ -143,8 +143,6 @@
                                 if (wordLen < maxWordLength && wordLen > 1) {
                                     super.addWord(word, FREQUENCY_FOR_CONTACTS);
                                     if (!TextUtils.isEmpty(prevWord)) {
-                                        // TODO Do not add email address
-                                        // Not so critical
                                         super.setBigram(prevWord, word,
                                                 FREQUENCY_FOR_CONTACTS_BIGRAM);
                                     }