1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index a8381020f..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;