diff options
Diffstat (limited to 'java/src/com/android/inputmethod/latin/CandidateView.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/CandidateView.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java index e5ed2da31..b4f6b2c91 100644 --- a/java/src/com/android/inputmethod/latin/CandidateView.java +++ b/java/src/com/android/inputmethod/latin/CandidateView.java @@ -156,7 +156,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo tv.setOnLongClickListener(this); mWords.add(tv); if (i > 0) { - View divider = inflater.inflate(R.layout.candidate_divider, null); + final View divider = inflater.inflate(R.layout.candidate_divider, null); mDividers.add(divider); } } @@ -198,7 +198,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo final int color; if (isAutoCorrect && mConfigCandidateHighlightFontColorEnabled) { color = mColorAutoCorrect; - } else if (isSuggestedCandidate) { + } else if (isSuggestedCandidate && mConfigCandidateHighlightFontColorEnabled) { color = mColorSuggestedCandidate; } else { color = mColorTypedWord; @@ -349,8 +349,10 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo @Override public boolean onLongClick(View view) { - int index = (Integer) view.getTag(); - CharSequence word = mSuggestions.getWord(index); + final int index = (Integer) view.getTag(); + if (index >= mSuggestions.size()) + return true; + final CharSequence word = mSuggestions.getWord(index); if (word.length() < 2) return false; addToDictionary(word); @@ -359,8 +361,10 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo @Override public void onClick(View view) { - int index = (Integer) view.getTag(); - CharSequence word = mSuggestions.getWord(index); + final int index = (Integer) view.getTag(); + if (index >= mSuggestions.size()) + return; + final CharSequence word = mSuggestions.getWord(index); if (mShowingAddToDictionary && index == 0) { addToDictionary(word); } else { |