diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 5c59f5f68..a96cfec1e 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -169,10 +169,6 @@ - - - - diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index daa167c8a..598a5d050 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -41,7 +41,9 @@ #D0FFFFFF - @android:color/holo_blue_light + #FF33B5E5 + #D833B5E5 + #B233B5E5 #9933B5E5 @android:color/white @android:color/transparent @@ -52,7 +54,6 @@ @android:color/white #FFC0C0C0 #80000000 - @color/highlight_color_ics #FFEBEBEB #FF707070 diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 37c6a9553..d175a12c0 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -382,13 +382,10 @@ > @drawable/keyboard_suggest_strip_holo autoCorrectBold|validTypedWordBold - @color/highlight_color_ics - @color/highlight_color_ics + @color/typed_word_color_ics + @color/typed_word_color_ics @color/highlight_color_ics - @color/highlight_color_ics - 85% - 85% - 70% + @color/suggested_word_color_ics 70% @integer/suggestions_count_in_strip @fraction/center_suggestion_percentile diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java index bcf64a8e8..ed0812583 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java @@ -125,24 +125,12 @@ final class SuggestionStripLayoutHelper { R.styleable.SuggestionStripView, defStyle, R.style.SuggestionStripViewStyle); mSuggestionStripOption = a.getInt( R.styleable.SuggestionStripView_suggestionStripOption, 0); - final float alphaValidTypedWord = ResourceUtils.getFraction(a, - R.styleable.SuggestionStripView_alphaValidTypedWord, 1.0f); - final float alphaTypedWord = ResourceUtils.getFraction(a, - R.styleable.SuggestionStripView_alphaTypedWord, 1.0f); - final float alphaAutoCorrect = ResourceUtils.getFraction(a, - R.styleable.SuggestionStripView_alphaAutoCorrect, 1.0f); - final float alphaSuggested = ResourceUtils.getFraction(a, - R.styleable.SuggestionStripView_alphaSuggested, 1.0f); mAlphaObsoleted = ResourceUtils.getFraction(a, - R.styleable.SuggestionStripView_alphaSuggested, 1.0f); - mColorValidTypedWord = applyAlpha(a.getColor( - R.styleable.SuggestionStripView_colorValidTypedWord, 0), alphaValidTypedWord); - mColorTypedWord = applyAlpha(a.getColor( - R.styleable.SuggestionStripView_colorTypedWord, 0), alphaTypedWord); - mColorAutoCorrect = applyAlpha(a.getColor( - R.styleable.SuggestionStripView_colorAutoCorrect, 0), alphaAutoCorrect); - mColorSuggested = applyAlpha(a.getColor( - R.styleable.SuggestionStripView_colorSuggested, 0), alphaSuggested); + R.styleable.SuggestionStripView_alphaObsoleted, 1.0f); + mColorValidTypedWord = a.getColor(R.styleable.SuggestionStripView_colorValidTypedWord, 0); + mColorTypedWord = a.getColor(R.styleable.SuggestionStripView_colorTypedWord, 0); + mColorAutoCorrect = a.getColor(R.styleable.SuggestionStripView_colorAutoCorrect, 0); + mColorSuggested = a.getColor(R.styleable.SuggestionStripView_colorSuggested, 0); mSuggestionsCountInStrip = a.getInt( R.styleable.SuggestionStripView_suggestionsCountInStrip, DEFAULT_SUGGESTIONS_COUNT_IN_STRIP);