diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 94f7ab78b..d08564444 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -127,9 +127,11 @@ + + diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 2b5fb08e5..2025a7dac 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -97,7 +97,8 @@ name="SuggestionsViewStyle" parent="SuggestionsStripBackgroundStyle" > - autoCorrectBold + autoCorrectBold|validTypedWordBold + #FFFCAE00 @android:color/white #FFFCAE00 #FFFCAE00 @@ -296,11 +297,12 @@ > autoCorrectBold|validTypedWordBold + @android:color/holo_blue_light @android:color/holo_blue_light @android:color/holo_blue_light @android:color/holo_blue_light + 85 85 - 100 70 70 @integer/suggestions_count_in_strip diff --git a/java/src/com/android/inputmethod/latin/SuggestionsView.java b/java/src/com/android/inputmethod/latin/SuggestionsView.java index 47c790093..ec0e0aece 100644 --- a/java/src/com/android/inputmethod/latin/SuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/SuggestionsView.java @@ -141,6 +141,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, private final List mDividers; private final List mInfos; + private final int mColorValidTypedWord; private final int mColorTypedWord; private final int mColorAutoCorrect; private final int mColorSuggested; @@ -184,6 +185,8 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, final TypedArray a = context.obtainStyledAttributes( attrs, R.styleable.SuggestionsView, defStyle, R.style.SuggestionsViewStyle); mSuggestionStripOption = a.getInt(R.styleable.SuggestionsView_suggestionStripOption, 0); + final float alphaValidTypedWord = getPercent(a, + R.styleable.SuggestionsView_alphaValidTypedWord, 100); final float alphaTypedWord = getPercent(a, R.styleable.SuggestionsView_alphaTypedWord, 100); final float alphaAutoCorrect = getPercent(a, @@ -191,6 +194,9 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, final float alphaSuggested = getPercent(a, R.styleable.SuggestionsView_alphaSuggested, 100); mAlphaObsoleted = getPercent(a, R.styleable.SuggestionsView_alphaSuggested, 100); + mColorValidTypedWord = applyAlpha( + a.getColor(R.styleable.SuggestionsView_colorValidTypedWord, 0), + alphaValidTypedWord); mColorTypedWord = applyAlpha( a.getColor(R.styleable.SuggestionsView_colorTypedWord, 0), alphaTypedWord); mColorAutoCorrect = applyAlpha( @@ -288,6 +294,8 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, final int color; if (index == mCenterSuggestionIndex && Utils.willAutoCorrect(suggestions)) { color = mColorAutoCorrect; + } else if (index == mCenterSuggestionIndex && suggestions.mTypedWordValid) { + color = mColorValidTypedWord; } else if (isSuggested) { color = mColorSuggested; } else { @@ -423,7 +431,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, final TextView word = mWords.get(index); word.setEnabled(true); - word.setTextColor(mColorTypedWord); + word.setTextColor(mColorAutoCorrect); final CharSequence text = suggestions.getWord(index); word.setText(text); word.setTextScaleX(1.0f);