Merge "Use the phone keyboard for NUMBER and DATETIME until we get a dedicated number entry keypad." into gingerbread
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index b84417b..0f5b430 100755
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -247,7 +247,9 @@
                 paint.setTypeface(Typeface.DEFAULT_BOLD);
                 paint.setColor(mColorRecommended);
                 existsAutoCompletion = true;
-            } else if (i != 0) {
+            } else if (i != 0 || (suggestion.length() == 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.
                 paint.setColor(mColorOther);
             }
             final int wordWidth;