From 89c58745d639a4434dfbe600c28dad1bc8bc6888 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 8 Dec 2010 20:05:34 +0900
Subject: Tweak candidate view height and etc.

Change-Id: I91963d0be122baf2274ea03b5028a66259a2cdb6
---
 .../android/inputmethod/latin/CandidateView.java   | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to '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 460ef8650..3196fa65d 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -138,19 +138,20 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
             TextView tv = (TextView)v.findViewById(R.id.candidate_word);
             tv.setTypeface(Typeface.DEFAULT);
             tv.setTextColor(mColorNormal);
-            if (mConfigCandidateHighlightFontColorEnabled) {
-                if (haveMinimalSuggestion
-                        && ((i == 1 && !typedWordValid) || (i == 0 && typedWordValid))) {
-                    tv.setTypeface(Typeface.DEFAULT_BOLD);
+            if (haveMinimalSuggestion
+                    && ((i == 1 && !typedWordValid) || (i == 0 && typedWordValid))) {
+                // TODO: Display underline for the auto-correction word
+                tv.setTypeface(Typeface.DEFAULT_BOLD);
+                if (mConfigCandidateHighlightFontColorEnabled)
                     tv.setTextColor(mColorRecommended);
-                    existsAutoCompletion = true;
-                } else if (i != 0 || (wordLength == 1 && count > 1)) {
-                    // HACK: even if i == 0, we use mColorOther when this suggestion's length is 1
-                    // and there are multiple suggestions, such as the default punctuation list.
+                existsAutoCompletion = true;
+            } else if (i != 0 || (wordLength == 1 && count > 1)) {
+                // HACK: even if i == 0, we use mColorOther when this
+                // suggestion's length is 1
+                // and there are multiple suggestions, such as the default
+                // punctuation list.
+                if (mConfigCandidateHighlightFontColorEnabled)
                     tv.setTextColor(mColorOther);
-                }
-            } else {
-                // TODO: Display underline for the auto-correction word
             }
             tv.setText(suggestion);
             tv.setClickable(true);
-- 
cgit v1.2.3-83-g751a