diff options
| author |   satok <satok@google.com> | 2010-09-01 08:30:54 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 08:30:54 -0700 |
| commit | 6f99ca9eaa658bafd1efeba40b7679230b0aac93 (patch) | |
| tree | 7495750dab8029edaca1c83a57bd2c11545a2af0 /java | |
| parent | 948ddac172e8af040f2758d7601de8636281618e (diff) | |
| parent | 103381ebf1a833ec478dd1bac41e67cf7d538f67 (diff) | |
| download | latinime-6f99ca9eaa658bafd1efeba40b7679230b0aac93.tar.gz latinime-6f99ca9eaa658bafd1efeba40b7679230b0aac93.tar.xz latinime-6f99ca9eaa658bafd1efeba40b7679230b0aac93.zip | |
am 103381eb: am d4f60bc8: Merge "Fix new theme assets and resources" into gingerbread
Merge commit '103381ebf1a833ec478dd1bac41e67cf7d538f67'
* commit '103381ebf1a833ec478dd1bac41e67cf7d538f67':
Fix new theme assets and resources
Diffstat (limited to 'java')
| -rwxr-xr-x[-rw-r--r--] | java/res/drawable-hdpi/sym_keyboard_feedback_settings.png | bin | 729 -> 2601 bytes | |||
| -rw-r--r-- | java/res/layout/keyboard_popup_keyboard.xml | 1 | ||||
| -rw-r--r-- | java/res/values/colors.xml | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboard.java | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png Binary files differindex 08ba18f28..7dee8984f 100644..100755 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png 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); |
