From ebbb5866936ca9193de2bfa0c0b2de1036aa4851 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 22 Nov 2012 18:18:53 +0900
Subject: [PATCH] Fix Gingerbread theme color for gesture typing
Change-Id: I96a660ce8ee35fe90dc29e6d7f52528c0b34b7cb
---
java/res/values/colors.xml | 53 +++++++++++++++++++++
java/res/values/styles.xml | 98 +++++++++++++++++++-------------------
2 files changed, 102 insertions(+), 49 deletions(-)
create mode 100644 java/res/values/colors.xml
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
new file mode 100644
index 0000000000..da4d87ccab
--- /dev/null
+++ b/java/res/values/colors.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Color resources for default, and Gingerbread theme. -->
+ <color name="highlight_color_default">#FFFCAE00</color>
+ <color name="key_text_color_default">@android:color/white</color>
+ <color name="key_text_shadow_color_default">#BB000000</color>
+ <color name="key_text_inactivated_color_default">@android:color/white</color>
+ <color name="key_hint_letter_color_default">#80000000</color>
+ <color name="key_hint_label_color_default">#E0E0E4E5</color>
+ <color name="key_shifted_letter_hint_inactivated_color_default">#66E0E4E5</color>
+ <color name="key_shifted_letter_hint_activated_color_default">#CCE0E4E5</color>
+ <color name="spacebar_text_color_default">#FFC0C0C0</color>
+ <color name="spacebar_text_shadow_color_default">#80000000</color>
+ <color name="typed_word_color_default">@android:color/white</color>
+ <color name="gesture_floating_preview_color_default">#C0000000</color>
+ <!-- Color resources for Stone theme. -->
+ <color name="key_text_color_stone">@android:color/black</color>
+ <color name="key_text_shadow_color_stone">@android:color/white</color>
+ <color name="key_text_inactivated_color_stone">#FF808080</color>
+ <color name="key_hint_letter_color_stone">#80000000</color>
+ <color name="key_hint_label_color_stone">#E0000000</color>
+ <color name="key_shifted_letter_hint_inactivated_color_stone">#66000000</color>
+ <color name="key_shifted_letter_hint_activated_color_stone">#CC000000</color>
+ <color name="spacebar_text_color_stone">@android:color/black</color>
+ <color name="spacebar_text_shadow_color_stone">#D0FFFFFF</color>
+ <!-- Color resources for IceCreamSandwich theme. -->
+ <color name="highlight_color_ics">@android:color/holo_blue_light</color>
+ <color name="key_text_color_ics">@android:color/white</color>
+ <color name="key_text_shadow_color_ics">@android:color/transparent</color>
+ <color name="key_text_inactivated_color_ics">#66E0E4E5</color>
+ <color name="key_hint_letter_color_ics">#80000000</color>
+ <color name="key_hint_label_color_ics">#A0FFFFFF</color>
+ <color name="key_shifted_letter_hint_inactivated_color_ics">#66E0E4E5</color>
+ <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>
+</resources>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 4766a2295c..b771463c25 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -43,32 +43,31 @@
<item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>
<item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item>
<item name="keyTypeface">normal</item>
- <item name="keyTextColor">#FFFFFFFF</item>
- <item name="keyTextInactivatedColor">#FFFFFFFF</item>
- <item name="keyHintLetterColor">#80000000</item>
- <item name="keyHintLabelColor">#E0E0E4E5</item>
- <item name="keyShiftedLetterHintInactivatedColor">#66E0E4E5</item>
- <item name="keyShiftedLetterHintActivatedColor">#CCE0E4E5</item>
+ <item name="keyTextColor">@color/key_text_color_default</item>
+ <item name="keyTextInactivatedColor">@color/key_text_color_default</item>
+ <item name="keyHintLetterColor">@color/key_hint_letter_color_default</item>
+ <item name="keyHintLabelColor">@color/key_hint_label_color_default</item>
+ <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_default</item>
+ <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_default</item>
<item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item>
<item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item>
<item name="keyPopupHintLetterPadding">@dimen/key_popup_hint_letter_padding</item>
<item name="keyShiftedLetterHintPadding">@dimen/key_uppercase_letter_padding</item>
<item name="keyPreviewLayout">@layout/key_preview</item>
- <item name="keyPreviewTextColor">#FFFFFFFF</item>
+ <item name="keyPreviewTextColor">@color/key_text_color_default</item>
<item name="keyPreviewOffset">@dimen/key_preview_offset</item>
<item name="keyPreviewHeight">@dimen/key_preview_height</item>
<item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
<item name="keyPreviewLingerTimeout">@integer/config_key_preview_linger_timeout</item>
<item name="moreKeysLayout">@layout/more_keys_keyboard</item>
<item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
- <item name="keyTextShadowColor">#BB000000</item>
+ <item name="keyTextShadowColor">@color/key_text_shadow_color_default</item>
<item name="keyTextShadowRadius">2.75</item>
<item name="backgroundDimAlpha">128</item>
- <!-- android:color/holo_blue_light=#FF33B5E5 -->
<item name="gestureFloatingPreviewTextSize">@dimen/gesture_floating_preview_text_size</item>
- <item name="gestureFloatingPreviewTextColor">@android:color/holo_blue_light</item>
+ <item name="gestureFloatingPreviewTextColor">@color/highlight_color_default</item>
<item name="gestureFloatingPreviewTextOffset">@dimen/gesture_floating_preview_text_offset</item>
- <item name="gestureFloatingPreviewColor">#C0000000</item>
+ <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_default</item>
<item name="gestureFloatingPreviewHorizontalPadding">@dimen/gesture_floating_preview_horizontal_padding</item>
<item name="gestureFloatingPreviewVerticalPadding">@dimen/gesture_floating_preview_vertical_padding</item>
<item name="gestureFloatingPreviewRoundRadius">@dimen/gesture_floating_preview_round_radius</item>
@@ -76,7 +75,7 @@
<item name="gesturePreviewTrailFadeoutStartDelay">@integer/config_gesture_preview_trail_fadeout_start_delay</item>
<item name="gesturePreviewTrailFadeoutDuration">@integer/config_gesture_preview_trail_fadeout_duration</item>
<item name="gesturePreviewTrailUpdateInterval">@integer/config_gesture_preview_trail_update_interval</item>
- <item name="gesturePreviewTrailColor">@android:color/holo_blue_light</item>
+ <item name="gesturePreviewTrailColor">@color/highlight_color_default</item>
<item name="gesturePreviewTrailStartWidth">@dimen/gesture_preview_trail_start_width</item>
<item name="gesturePreviewTrailEndWidth">@dimen/gesture_preview_trail_end_width</item>
<!-- Common attributes of MainKeyboardView -->
@@ -114,8 +113,8 @@
<item name="autoCorrectionSpacebarLedEnabled">true</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
- <item name="spacebarTextColor">#FFC0C0C0</item>
- <item name="spacebarTextShadowColor">#80000000</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_default</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_default</item>
</style>
<style
name="MoreKeysKeyboard"
@@ -144,10 +143,10 @@
parent="SuggestionsStripBackgroundStyle"
>
<item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
- <item name="colorValidTypedWord">#FFFCAE00</item>
- <item name="colorTypedWord">@android:color/white</item>
- <item name="colorAutoCorrect">#FFFCAE00</item>
- <item name="colorSuggested">#FFFCAE00</item>
+ <item name="colorValidTypedWord">@color/highlight_color_default</item>
+ <item name="colorTypedWord">@color/typed_word_color_default</item>
+ <item name="colorAutoCorrect">@color/highlight_color_default</item>
+ <item name="colorSuggested">@color/highlight_color_default</item>
<item name="alphaObsoleted">50%</item>
<item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
<item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item>
@@ -187,8 +186,8 @@
<item name="autoCorrectionSpacebarLedEnabled">true</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
- <item name="spacebarTextColor">#FFC0C0C0</item>
- <item name="spacebarTextShadowColor">#80000000</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_default</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_default</item>
</style>
<!-- Theme "Stone" -->
<style
@@ -207,13 +206,13 @@
parent="KeyboardView"
>
<item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
- <item name="keyTextColor">#FF000000</item>
- <item name="keyTextInactivatedColor">#FF808080</item>
- <item name="keyHintLetterColor">#80000000</item>
- <item name="keyHintLabelColor">#E0000000</item>
- <item name="keyShiftedLetterHintInactivatedColor">#66000000</item>
- <item name="keyShiftedLetterHintActivatedColor">#CC000000</item>
- <item name="keyTextShadowColor">#FFFFFFFF</item>
+ <item name="keyTextColor">@color/key_text_color_stone</item>
+ <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_stone</item>
+ <item name="keyHintLetterColor">@color/key_hint_letter_color_stone</item>
+ <item name="keyHintLabelColor">@color/key_hint_label_color_stone</item>
+ <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_stone</item>
+ <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_stone</item>
+ <item name="keyTextShadowColor">@color/key_text_shadow_color_stone</item>
</style>
<style
name="MainKeyboardView.Stone"
@@ -222,8 +221,8 @@
<item name="autoCorrectionSpacebarLedEnabled">true</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
- <item name="spacebarTextColor">#FF000000</item>
- <item name="spacebarTextShadowColor">#D0FFFFFF</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_stone</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_stone</item>
</style>
<style
name="MoreKeysKeyboard.Stone"
@@ -239,8 +238,8 @@
parent="MoreKeysKeyboardView"
>
<item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
- <item name="keyTextColor">#FF000000</item>
- <item name="keyTextShadowColor">#FFFFFFFF</item>
+ <item name="keyTextColor">@color/key_text_color_stone</item>
+ <item name="keyTextShadowColor">@color/key_text_shadow_color_stone</item>
</style>
<!-- Theme "Stone bold" -->
<style
@@ -263,8 +262,8 @@
<item name="autoCorrectionSpacebarLedEnabled">true</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
- <item name="spacebarTextColor">#FF000000</item>
- <item name="spacebarTextShadowColor">#D0FFFFFF</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_stone</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_stone</item>
</style>
<!-- Theme "Gingerbread" -->
<style
@@ -292,8 +291,8 @@
<item name="autoCorrectionSpacebarLedEnabled">true</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
- <item name="spacebarTextColor">#FFC0C0C0</item>
- <item name="spacebarTextShadowColor">#80000000</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_default</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_default</item>
</style>
<style
name="MoreKeysKeyboard.Gingerbread"
@@ -330,16 +329,18 @@
<item name="android:background">@drawable/keyboard_background_holo</item>
<item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
<item name="keyTypeface">bold</item>
- <item name="keyTextInactivatedColor">#66E0E4E5</item>
- <item name="keyHintLetterColor">#80000000</item>
- <item name="keyHintLabelColor">#A0FFFFFF</item>
- <item name="keyShiftedLetterHintInactivatedColor">#66E0E4E5</item>
- <item name="keyShiftedLetterHintActivatedColor">#FFFFFFFF</item>
+ <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_ics</item>
+ <item name="keyHintLetterColor">@color/key_hint_letter_color_ics</item>
+ <item name="keyHintLabelColor">@color/key_hint_label_color_ics</item>
+ <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_ics</item>
+ <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_ics</item>
<item name="keyPreviewLayout">@layout/key_preview_ics</item>
- <item name="keyPreviewTextColor">#FFFFFFFF</item>
+ <item name="keyPreviewTextColor">@color/key_text_color_ics</item>
<item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
- <item name="keyTextShadowColor">#00000000</item>
+ <item name="keyTextShadowColor">@color/key_text_shadow_color_ics</item>
<item name="keyTextShadowRadius">0.0</item>
+ <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item>
+ <item name="gesturePreviewTrailColor">@color/highlight_color_ics</item>
</style>
<style
name="MainKeyboardView.IceCreamSandwich"
@@ -348,8 +349,8 @@
<item name="autoCorrectionSpacebarLedEnabled">false</item>
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led_holo</item>
<item name="spacebarTextRatio">@fraction/spacebar_text_ratio</item>
- <item name="spacebarTextColor">#FFC0C0C0</item>
- <item name="spacebarTextShadowColor">#80000000</item>
+ <item name="spacebarTextColor">@color/spacebar_text_color_ics</item>
+ <item name="spacebarTextShadowColor">@color/spacebar_text_shadow_color_ics</item>
</style>
<style
name="MoreKeysKeyboard.IceCreamSandwich"
@@ -379,11 +380,10 @@
parent="SuggestionsStripBackgroundStyle.IceCreamSandwich"
>
<item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
- <!-- android:color/holo_blue_light=#FF33B5E5 -->
- <item name="colorValidTypedWord">@android:color/holo_blue_light</item>
- <item name="colorTypedWord">@android:color/holo_blue_light</item>
- <item name="colorAutoCorrect">@android:color/holo_blue_light</item>
- <item name="colorSuggested">@android:color/holo_blue_light</item>
+ <item name="colorValidTypedWord">@color/highlight_color_ics</item>
+ <item name="colorTypedWord">@color/highlight_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>
--
GitLab