nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am d4f60bc8: Merge "Fix new theme assets and resources" into gingerbread 

Merge commit 'd4f60bc8fcf60990aa7593a866c645eaf7c08a93' into gingerbread-plus-aosp

* commit 'd4f60bc8fcf60990aa7593a866c645eaf7c08a93':
  Fix new theme assets and resources
main
satok 2010-09-01 01:53:44 -07:00 committed by Android Git Automerger
parent fcba07adb7 d4f60bc8fc
commit 103381ebf1
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java/res/drawable-hdpi/sym_keyboard_feedback_settings.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 729 B

After

Width:  |  Height:  |  Size: 2.5 KiB

1
java/res/layout/keyboard_popup_keyboard.xml
View File

@ -32,6 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
latin:keyPreviewLayout="@layout/keyboard_key_preview" latin:keyPreviewLayout="@layout/keyboard_key_preview"
latin:popupLayout="@layout/keyboard_popup_keyboard" latin:popupLayout="@layout/keyboard_popup_keyboard"
/> />

6
java/res/values/colors.xml
View File

@ -20,13 +20,13 @@
<resources> <resources>
<color name="candidate_normal">#FFFFFFFF</color> <color name="candidate_normal">#FFFFFFFF</color>
<color name="candidate_recommended">#FFF07020</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_transparent">#00000000</color>
<color name="latinkeyboard_bar_language_shadow_white">#80000000</color> <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
<color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</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_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_white">#FFFFFFFF</color>
<color name="latinkeyboard_key_color_black">#FF000000</color> <color name="latinkeyboard_key_color_black">#FF000000</color>
</resources> </resources>

2
java/src/com/android/inputmethod/latin/LatinKeyboard.java
View File

@ -732,7 +732,7 @@ public class LatinKeyboard extends Keyboard {
public void draw(Canvas canvas) { public void draw(Canvas canvas) {
canvas.save(); canvas.save();
if (mHitThreshold) { 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); canvas.clipRect(0, 0, mWidth, mHeight);
if (mCurrentLanguage == null) { if (mCurrentLanguage == null) {
mCurrentLanguage = getInputLanguage(mWidth, mTextPaint); mCurrentLanguage = getInputLanguage(mWidth, mTextPaint);