diff options
| author |   Amith Yamasani <yamasani@google.com> | 2010-05-12 16:44:14 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2010-05-12 16:44:14 -0700 |
| commit | 8aaca66928d6df0541d45c4cdbc50b52595e340b (patch) | |
| tree | ede37bb451a8c4eec9a77b1752957bdca146c1f9 /java/src | |
| parent | 8d6bd9389f6a184ed43d4bc43dbd09ba7f479fe9 (diff) | |
| parent | 75e0abcfdba338fe6a46770d3c964f296f96a2f2 (diff) | |
| download | latinime-8aaca66928d6df0541d45c4cdbc50b52595e340b.tar.gz latinime-8aaca66928d6df0541d45c4cdbc50b52595e340b.tar.xz latinime-8aaca66928d6df0541d45c4cdbc50b52595e340b.zip | |
Merge "Fix a bug throwing IndexOutOfBoundsException when IME receives completions more than MAX_SUGGESTIONS in full-screen mode."
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/com/android/inputmethod/latin/CandidateView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java index 0bd993e7b..ae45001b8 100755 --- a/java/src/com/android/inputmethod/latin/CandidateView.java +++ b/java/src/com/android/inputmethod/latin/CandidateView.java @@ -219,7 +219,7 @@ public class CandidateView extends View { 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 class CandidateView extends View { 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 @@ public class CandidateView extends View { 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 && |