commit 75e0abcfdba338fe6a46770d3c964f296f96a2f2
author Yuncheol Heo <ycheo@google.com> Wed May 12 09:59:38 2010 +0900
committer Yuncheol Heo <ycheo@google.com> Wed May 12 10:56:57 2010 +0900
tree 88e8f8c75b8c8ca9fcf7bcd9b73dff7339b0d755
parent 44357b74a3b7b3eaa5390d1a7427642bcf52dcf9

Fix a bug throwing IndexOutOfBoundsException when IME receives completions more than MAX_SUGGESTIONS in full-screen mode.

Change-Id: Ic76287c2f8aa91733769e789df1f2a0614100f65

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

diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 0bd993e..ae45001 100755
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -219,7 +219,7 @@
                     mDivider.getIntrinsicHeight());
         }
         int x = 0;
-        final int count = mSuggestions.size(); 
+        final int count = Math.min(mSuggestions.size(), MAX_SUGGESTIONS);
         final int width = getWidth();
         final Rect bgPadding = mBgPadding;
         final Paint paint = mPaint;
@@ -335,7 +335,7 @@
 
     public void scrollPrev() {
         int i = 0;
-        final int count = mSuggestions.size();
+        final int count = Math.min(mSuggestions.size(), MAX_SUGGESTIONS);
         int firstItem = 0; // Actually just before the first item, if at the boundary
         while (i < count) {
             if (mWordX[i] < getScrollX() 
@@ -354,7 +354,7 @@
         int i = 0;
         int scrollX = getScrollX();
         int targetX = scrollX;
-        final int count = mSuggestions.size();
+        final int count = Math.min(mSuggestions.size(), MAX_SUGGESTIONS);
         int rightEdge = scrollX + getWidth();
         while (i < count) {
             if (mWordX[i] <= rightEdge &&