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

Commit c2cae246 authored by Fahim's avatar Fahim
Browse files

4455-Q-Fix_key_popup_background_color_mismatch 

issue: e/backlog#4455
parent 2a57ab27

java/res/values/themes-ics.xml

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
        <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>

        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>

        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>

        <item name="keyPreviewTextColor">@color/color_default_primary_text</item>

    </style>

    <style

        name="MainKeyboardView.ICS"
@@ -117,7 +117,7 @@ 
        name="MoreKeysKeyboardView.ICS"

        parent="KeyboardView.ICS"

    >

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@color/color_default_primary_dark</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>

        <item name="divider">@drawable/more_keys_divider</item>

        <item name="keyTypeface">normal</item>

java/res/values/themes-klp.xml

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
        <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>

        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>

        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>

        <item name="keyPreviewTextColor">@color/color_default_primary_text</item>

    </style>

    <style

        name="MainKeyboardView.KLP"
@@ -117,7 +117,7 @@ 
        name="MoreKeysKeyboardView.KLP"

        parent="KeyboardView.KLP"

    >

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@color/color_default_primary_dark</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>

        <item name="divider">@drawable/more_keys_divider</item>

        <item name="keyTypeface">normal</item>

java/res/values/themes-lxx-dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>

        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>

        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>

        <item name="keyPreviewTextColor">@color/color_default_primary_text</item>

    </style>

    <style

        name="MainKeyboardView.LXX_Dark"
@@ -115,7 +115,7 @@ 
        name="MoreKeysKeyboardView.LXX_Dark"

        parent="KeyboardView.LXX_Dark"

    >

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@color/color_default_primary_dark</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_dark</item>

        <item name="divider">@drawable/more_keys_divider</item>

        <item name="keyTypeface">normal</item>

java/res/values/themes-lxx-light.xml

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_light</item>

        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_light</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_light</item>

        <item name="keyPreviewTextColor">@color/color_default_view_on_accent</item>

        <item name="keyPreviewTextColor">@color/color_default_primary_text</item>

    </style>

    <style

        name="MainKeyboardView.LXX_Light"
@@ -115,7 +115,7 @@ 
        name="MoreKeysKeyboardView.LXX_Light"

        parent="KeyboardView.LXX_Light"

    >

        <item name="android:background">@color/color_default_background</item>

        <item name="android:background">@color/color_default_primary_dark</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_light</item>

        <item name="divider">@drawable/more_keys_divider</item>

        <item name="keyTypeface">normal</item>

java/src/com/android/inputmethod/keyboard/internal/KeyPreviewView.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class KeyPreviewView extends TextView { 
            return;

        }

        background.getPadding(mBackgroundPadding);

        background.setTint(R.color.color_default_primary_dark);

        //background.setTint(R.color.color_default_primary_dark);

        final int maxWidth = background.getIntrinsicWidth() - mBackgroundPadding.left

                - mBackgroundPadding.right;

        final float width = getTextWidth(text, getPaint());