Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4f60bc8 authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Fix new theme assets and resources" into gingerbread

parents 4de4d51d 8d3ca2fc

java/res/drawable-hdpi/sym_keyboard_feedback_settings.png

100644 → 100755
+1.83 KiB (2.54 KiB)
Loading image diff...

java/res/layout/keyboard_popup_keyboard.xml

+1 −0
Original line number Diff line number Diff line
@@ -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"

            />

java/res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -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>

java/src/com/android/inputmethod/latin/LatinKeyboard.java

+1 −1
Original line number Diff line number Diff line
@@ -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);