diff --git a/java/res/drawable-hdpi/more_suggestions_hint_holo.png b/java/res/drawable-hdpi/more_suggestions_hint_holo.png new file mode 100644 index 000000000..93604752b Binary files /dev/null and b/java/res/drawable-hdpi/more_suggestions_hint_holo.png differ diff --git a/java/res/drawable-mdpi/more_suggestions_hint_holo.png b/java/res/drawable-mdpi/more_suggestions_hint_holo.png new file mode 100644 index 000000000..7352810d3 Binary files /dev/null and b/java/res/drawable-mdpi/more_suggestions_hint_holo.png differ diff --git a/java/res/drawable-xhdpi/more_suggestions_hint_holo.png b/java/res/drawable-xhdpi/more_suggestions_hint_holo.png new file mode 100644 index 000000000..35fb42087 Binary files /dev/null and b/java/res/drawable-xhdpi/more_suggestions_hint_holo.png differ diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index a876e2889..9358c9085 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -126,8 +126,13 @@ + + + + + diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 9fa4d842e..6aa967410 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -96,11 +96,13 @@ parent="SuggestionsStripBackgroundStyle" > autoCorrectBold - #FFFFFFFF + @android:color/white #FFFCAE00 #FFFCAE00 + 50 @integer/suggestions_count_in_strip @integer/center_suggestion_percentile + @drawable/more_suggestions_hint @integer/max_more_suggestions_row @fraction/min_more_suggestions_width @@ -272,11 +274,17 @@ parent="SuggestionsStripBackgroundStyle.IceCreamSandwich" > autoCorrectBold|validTypedWordBold - #FFBCBEC0 - #FF0099CC - #FFA7A9AC + + @android:color/holo_blue_light + @android:color/holo_blue_light + @android:color/holo_blue_light + 85 + 100 + 70 + 70 @integer/suggestions_count_in_strip @integer/center_suggestion_percentile + @drawable/more_suggestions_hint_holo @integer/max_more_suggestions_row @fraction/min_more_suggestions_width diff --git a/java/src/com/android/inputmethod/latin/SuggestionsView.java b/java/src/com/android/inputmethod/latin/SuggestionsView.java index 380e73bc0..b00036b49 100644 --- a/java/src/com/android/inputmethod/latin/SuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/SuggestionsView.java @@ -163,6 +163,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, private final int mColorTypedWord; private final int mColorAutoCorrect; private final int mColorSuggested; + private final float mAlphaObsoleted; private final float mCenterSuggestionWeight; private final int mCenterSuggestionIndex; private final Drawable mMoreSuggestionsHint; @@ -205,15 +206,26 @@ 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); - mColorTypedWord = a.getColor(R.styleable.SuggestionsView_colorTypedWord, 0); - mColorAutoCorrect = a.getColor(R.styleable.SuggestionsView_colorAutoCorrect, 0); - mColorSuggested = a.getColor(R.styleable.SuggestionsView_colorSuggested, 0); + final float alphaTypedWord = getPercent(a, + R.styleable.SuggestionsView_alphaTypedWord, 100); + final float alphaAutoCorrect = getPercent(a, + R.styleable.SuggestionsView_alphaAutoCorrect, 100); + final float alphaSuggested = getPercent(a, + R.styleable.SuggestionsView_alphaSuggested, 100); + mAlphaObsoleted = getPercent(a, R.styleable.SuggestionsView_alphaSuggested, 100); + mColorTypedWord = applyAlpha( + a.getColor(R.styleable.SuggestionsView_colorTypedWord, 0), alphaTypedWord); + mColorAutoCorrect = applyAlpha( + a.getColor(R.styleable.SuggestionsView_colorAutoCorrect, 0), alphaAutoCorrect); + mColorSuggested = applyAlpha( + a.getColor(R.styleable.SuggestionsView_colorSuggested, 0), alphaSuggested); mSuggestionsCountInStrip = a.getInt( R.styleable.SuggestionsView_suggestionsCountInStrip, DEFAULT_SUGGESTIONS_COUNT_IN_STRIP); - mCenterSuggestionWeight = a.getInt( + mCenterSuggestionWeight = getPercent(a, R.styleable.SuggestionsView_centerSuggestionPercentile, - DEFAULT_CENTER_SUGGESTION_PERCENTILE) / 100.0f; + DEFAULT_CENTER_SUGGESTION_PERCENTILE); + mMoreSuggestionsHint = a.getDrawable(R.styleable.SuggestionsView_moreSuggestionsHint); mMaxMoreSuggestionsRow = a.getInt( R.styleable.SuggestionsView_maxMoreSuggestionsRow, DEFAULT_MAX_MORE_SUGGESTIONS_ROW); @@ -222,7 +234,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, a.recycle(); mCenterSuggestionIndex = mSuggestionsCountInStrip / 2; - mMoreSuggestionsHint = res.getDrawable(R.drawable.more_suggestions_hint); mMoreSuggestionsBottomGap = res.getDimensionPixelOffset( R.dimen.more_suggestions_bottom_gap); @@ -235,6 +246,11 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, mHintToSaveText = context.getText(R.string.hint_add_to_dictionary); } + // Read integer value in TypedArray as percent. + private static float getPercent(TypedArray a, int index, int defValue) { + return a.getInt(index, defValue) / 100.0f; + } + // Read fraction value in TypedArray as float. private static float getRatio(TypedArray a, int index) { return a.getFraction(index, 1000, 1000, 1) / 1000.0f; @@ -293,7 +309,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, final SuggestedWordInfo info = (pos < suggestions.size()) ? suggestions.getInfo(pos) : null; if (info != null && info.isObsoleteSuggestedWord()) { - return applyAlpha(color, 0.5f); + return applyAlpha(color, mAlphaObsoleted); } else { return color; }