Merge remote branch 'goog/master' into merge6

Change-Id: If021cd2074cd4c4f6755a7ceaec0e90ea122956c

1 files changed, 3 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index bd73c6fb8..0f5b43009 100755
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -186,7 +186,6 @@ public class CandidateView extends View {
                 return true;
             }
         });
-        setHorizontalFadingEdgeEnabled(true);
         setWillNotDraw(false);
         setHorizontalScrollBarEnabled(false);
         setVerticalScrollBarEnabled(false);
@@ -248,7 +247,9 @@ public class CandidateView extends View {
                 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;