commit d7e42d7bcce00f55888588bf2b97d967a47c4cf6
author Amith Yamasani <yamasani@google.com> Tue Dec 08 10:07:29 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 08 10:07:29 2009 -0800
tree e29470f074a8d5fef242229a8788b181c69aea1b
parent 929dc479b08fe5d1bf859054a8857c80acc6fd08
parent 5b63c38d1fc9e42348a8a90edf8dce6103f72864

am 5b63c38d: Fix 2306814: Too aggressive suggesting names from my contacts list.

Merge commit '5b63c38d1fc9e42348a8a90edf8dce6103f72864' into eclair-plus-aosp

* commit '5b63c38d1fc9e42348a8a90edf8dce6103f72864':
  Fix 2306814: Too aggressive suggesting names from my contacts list.

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

diff --git a/src/com/android/inputmethod/latin/ExpandableDictionary.java b/src/com/android/inputmethod/latin/ExpandableDictionary.java
index a136ee7..1589168 100644
--- a/src/com/android/inputmethod/latin/ExpandableDictionary.java
+++ b/src/com/android/inputmethod/latin/ExpandableDictionary.java
@@ -105,8 +105,8 @@
         if (wordLength == depth + 1) {
             // Terminate this word
             childNode.terminal = true;
-            childNode.frequency += frequency; // If there are multiple similar words
-            if (childNode.frequency > 256) childNode.frequency = 256;
+            childNode.frequency = Math.max(frequency, childNode.frequency);
+            if (childNode.frequency > 255) childNode.frequency = 255;
             return;
         }
         if (childNode.children == null) {