From 8d3ca2fc449cbce7f88a77c0f3b80c0270975d14 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Wed, 1 Sep 2010 17:34:30 +0900
Subject: [PATCH] Fix new theme assets and resources

- Add a layout for popup for new theme
- Change the color of language bar
- Fix a drawable for settings feedback

Change-Id: I7c0c9e238c8223554a62f7b0c8092d074cf9743f
---
 .../sym_keyboard_feedback_settings.png         | Bin 729 -> 2601 bytes
 java/res/layout/keyboard_popup_keyboard.xml    |   1 +
 java/res/values/colors.xml                     |   6 +++---
 .../inputmethod/latin/LatinKeyboard.java       |   2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 java/res/drawable-hdpi/sym_keyboard_feedback_settings.png

diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
old mode 100644
new mode 100755
index 08ba18f28db90ae647f03e5ee4111cc29a2ebb27..7dee8984f5f4e616aa23d96cba581e63ff599d58
GIT binary patch
literal 2601
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

delta 704
zcmV;x0zdt!6xjtKiBL{Q4GJ0x0000DNk~Le0000a0000p2nGNE0RPjfyOAL$e*$|+
zL_t(|+U%JBN5erF$M-2B#uzcih=}N?F-DY#5hEfZ`Y9s%DM~~{MD$PebHBtAV=1Cv
z#wbgaWt3)=7*W=9dCGO&J@<UJr7!MybA7sd?sfNhzT9VCy<QLersg>y2jqYpkOTTl
zK%VFQ2*f9b{{YkhN`ca#IA{;Fe*|g=U4YI&$DkwBiyxr3Ki<V`D`J`?0WkwwRh|n)
zxF__%zywNwy0M?uEUeQ#C?;*9zg0j}pc<$Q+QPoNxOkq?JQrj4rT$p6K$DD<D4<_O
zK~>AxCmoa@phL?7V%L4r_-V!lCYu2gyM88&&uQlD65}uNG<^dJCk}(we+`C<pg|%n
zEP@^lb2mV<7#u91Ao{|y;dF$Pb~2(_L|BP9tqaUuR-h@uNKt`_;*PTjDo(UZ`hOf9
z*<>%p0oo=E3`>ipFxRMK#OaPm<K_u_8yuj5VRBwtBw`8iJM=-(LWbNWl;Z$Zsoh}P
zWQ6y+G(JQ4(I<vBjWdP~e@=R?M4_$4rT(>H%$K!vKo8$=!!T9+b`DU*Fu7amA2A?K
zq<)WK%mZE6==WVzj{1i1pAtH=&8agSr(Uz=4QvB=1JIQR*~b<Ldutq^gk|TlBZly<
zlffFcjG113RgZ+d1h<yu2_uKho8X}3wVwJZuA`P5Q^FF{p#cfve`|WO*qG1(QJ4H2
zQPJPqEk;}gLpY3n7PQPe01f%Q<VUdt)LX1F+HUBAmSh~gAJueO-tQ$pX>m@jZcHVo
zk<XwQ`c$JZS@ktF3lxyP$qGI|3Q97y0yX+=-wPVYC=6o)6b1AOBThuoj&eiz2R}Br
mAFLdZ19CtPC=hrR7GMCz{eL$=$u^__0000<MNUMnLSTYR%{nvy

diff --git a/java/res/layout/keyboard_popup_keyboard.xml b/java/res/layout/keyboard_popup_keyboard.xml
index a1b571ace..0b0046a49 100644
--- a/java/res/layout/keyboard_popup_keyboard.xml
+++ b/java/res/layout/keyboard_popup_keyboard.xml
@@ -32,6 +32,7 @@
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
 
+            latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
             latin:keyPreviewLayout="@layout/keyboard_key_preview"
             latin:popupLayout="@layout/keyboard_popup_keyboard"
             />
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 5ca96241e..245648df2 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -20,13 +20,13 @@
 <resources>
     <color name="candidate_normal">#FFFFFFFF</color>
     <color name="candidate_recommended">#FFF07020</color>
-    <color name="candidate_other">#ffB05010</color>
+    <color name="candidate_other">#ffD06015</color>
     <color name="latinkeyboard_transparent">#00000000</color>
     <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
     <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
-    <color name="latinkeyboard_bar_language_text">#FF808080</color>
+    <color name="latinkeyboard_bar_language_text">#FFC0C0C0</color>
     <color name="latinkeyboard_extension_background">#A0000000</color>
-    <color name="latinkeyboard_text_color">#FF000000</color>
+    <color name="latinkeyboard_feedback_language_text">#FFFFFFFF</color>
     <color name="latinkeyboard_key_color_white">#FFFFFFFF</color>
     <color name="latinkeyboard_key_color_black">#FF000000</color>
 </resources>
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index c35a1b05a..15e22f318 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -732,7 +732,7 @@ public class LatinKeyboard extends Keyboard {
         public void draw(Canvas canvas) {
             canvas.save();
             if (mHitThreshold) {
-                mTextPaint.setColor(mRes.getColor(R.color.latinkeyboard_text_color));
+                mTextPaint.setColor(mRes.getColor(R.color.latinkeyboard_feedback_language_text));
                 canvas.clipRect(0, 0, mWidth, mHeight);
                 if (mCurrentLanguage == null) {
                     mCurrentLanguage = getInputLanguage(mWidth, mTextPaint);