commit e10f56aeb11354e8e7ac290ea4892b2b2717b2c8
author Amith Yamasani <yamasani@google.com> Wed Dec 09 15:47:15 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 09 15:47:15 2009 -0800
tree 01fb6baeb3507ec3c661e7097d169f8abb528659
parent f4eb9bd9b1de20d57b35259fe27b75d520b850f6
parent 24c1ff4993734a1475d98a3456b8cbae4e16204e

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

Merge commit '24c1ff4993734a1475d98a3456b8cbae4e16204e' into eclair-mr2-plus-aosp

* commit '24c1ff4993734a1475d98a3456b8cbae4e16204e':
  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) {