diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-20 20:52:17 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-20 20:52:17 -0700 |
| commit | 473b0540bfb5e34385e46fb9c080db5e4c520eac (patch) | |
| tree | ca77d3869efb4ceea1e7bb6ebf8e38ea96ea6564 /java/res | |
| parent | d619127d2f178a8b30a0dc668f69918b470c062d (diff) | |
| parent | 1f39d36458d09bfdfcf05ee0fcf7fc6116582099 (diff) | |
| download | latinime-473b0540bfb5e34385e46fb9c080db5e4c520eac.tar.gz latinime-473b0540bfb5e34385e46fb9c080db5e4c520eac.tar.xz latinime-473b0540bfb5e34385e46fb9c080db5e4c520eac.zip | |
am 1f39d364: Remove unnecessary alpha attributes of SuggestionStripView
* commit '1f39d36458d09bfdfcf05ee0fcf7fc6116582099':
Remove unnecessary alpha attributes of SuggestionStripView
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | java/res/values/colors.xml | 5 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 9 |
3 files changed, 6 insertions, 12 deletions
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 @@ <attr name="colorTypedWord" format="color" /> <attr name="colorAutoCorrect" format="color" /> <attr name="colorSuggested" format="color" /> - <attr name="alphaValidTypedWord" format="fraction" /> - <attr name="alphaTypedWord" format="fraction" /> - <attr name="alphaAutoCorrect" format="fraction" /> - <attr name="alphaSuggested" format="fraction" /> <attr name="alphaObsoleted" format="fraction" /> <attr name="suggestionsCountInStrip" format="integer" /> <attr name="centerSuggestionPercentile" format="fraction" /> 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 @@ <color name="spacebar_text_shadow_color_stone">#D0FFFFFF</color> <!-- Color resources for IceCreamSandwich theme. --> <!-- android:color/holo_blue_light value is #FF33B5E5 --> - <color name="highlight_color_ics">@android:color/holo_blue_light</color> + <color name="highlight_color_ics">#FF33B5E5</color> + <color name="typed_word_color_ics">#D833B5E5</color> + <color name="suggested_word_color_ics">#B233B5E5</color> <color name="highlight_translucent_color_ics">#9933B5E5</color> <color name="key_text_color_ics">@android:color/white</color> <color name="key_text_shadow_color_ics">@android:color/transparent</color> @@ -52,7 +54,6 @@ <color name="key_shifted_letter_hint_activated_color_ics">@android:color/white</color> <color name="spacebar_text_color_ics">#FFC0C0C0</color> <color name="spacebar_text_shadow_color_ics">#80000000</color> - <color name="typed_word_color_ics">@color/highlight_color_ics</color> <!-- Color resources for setup wizard and tutorial --> <color name="setup_background">#FFEBEBEB</color> <color name="setup_text_dark">#FF707070</color> 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 @@ > <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> - <item name="colorValidTypedWord">@color/highlight_color_ics</item> - <item name="colorTypedWord">@color/highlight_color_ics</item> + <item name="colorValidTypedWord">@color/typed_word_color_ics</item> + <item name="colorTypedWord">@color/typed_word_color_ics</item> <item name="colorAutoCorrect">@color/highlight_color_ics</item> - <item name="colorSuggested">@color/highlight_color_ics</item> - <item name="alphaValidTypedWord">85%</item> - <item name="alphaTypedWord">85%</item> - <item name="alphaSuggested">70%</item> + <item name="colorSuggested">@color/suggested_word_color_ics</item> <item name="alphaObsoleted">70%</item> <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> |