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

Commit 63fc1595 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Update Material theme colors"

parents b3bd025b 509d9be2

java/res/drawable/btn_suggestion_lxx_light.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ 
>

    <item

        android:state_pressed="true"

        android:drawable="@color/suggested_word_background_selected_lxx_dark" />

        android:drawable="@color/suggested_word_background_selected_lxx_light" />

</selector>

java/res/values/colors.xml

+20 −16
Original line number Diff line number Diff line
@@ -40,34 +40,38 @@ 
    <color name="typed_word_color_klp">#D8F0F0F0</color>

    <color name="suggested_word_color_klp">#B2F0F0F0</color>

    <color name="highlight_translucent_color_klp">#99E0E0E0</color>

    <!-- Color resources for LXX_Light theme. -->

    <color name="key_text_color_lxx_light">#546E7A</color>

    <color name="key_text_inactive_color_lxx_light">#99546E7A</color>

    <color name="key_hint_letter_color_lxx_light">#99546E7A</color>

    <!-- Color resources for LXX_Light theme.

         15%:0x26 60%:0x99 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 -->

    <color name="key_text_color_lxx_light">#37474F</color>

    <color name="key_functional_text_color_lxx_light">#CC37474F</color>

    <color name="key_text_inactive_color_lxx_light">#B337474F</color>

    <color name="key_hint_letter_color_lxx_light">#B337474F</color>

    <color name="highlight_color_lxx_light">#4DB6AC</color>

    <color name="typed_word_color_lxx_light">#D84DB6AC</color>

    <color name="suggested_word_color_lxx_light">#B24DB6AC</color>

    <color name="typed_word_color_lxx_light">#D94DB6AC</color>

    <color name="suggested_word_color_lxx_light">#B34DB6AC</color>

    <color name="highlight_translucent_color_lxx_light">#994DB6AC</color>

    <color name="keyboard_background_lxx_light">#ECEFF1</color>

    <color name="key_background_lxx_light">#ECEFF1</color>

    <color name="key_background_pressed_lxx_light">#26546E7A</color>

    <color name="key_background_pressed_lxx_light">#2637474F</color>

    <color name="suggestions_strip_background_lxx_light">#E4E7E9</color>

    <color name="suggested_word_background_selected_lxx_light">#26546E7A</color>

    <color name="suggested_word_background_selected_lxx_light">#2637474F</color>

    <color name="gesture_floating_preview_color_lxx_light">#C0000000</color>

    <color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>

    <!-- Color resources for LXX_Dark theme. -->

    <color name="key_text_color_lxx_dark">#B3FFFFFF</color>

    <color name="key_text_inactive_color_lxx_dark">#66FFFFFF</color>

    <color name="key_hint_letter_color_lxx_dark">#66FFFFFF</color>

    <!-- Color resources for LXX_Dark theme.

         10%:0x19 50%:0x80 60%:0x99 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9  -->

    <color name="key_text_color_lxx_dark">#CCFFFFFF</color>

    <color name="key_functional_text_color_lxx_dark">#CCFFFFFF</color>

    <color name="key_text_inactive_color_lxx_dark">#80FFFFFF</color>

    <color name="key_hint_letter_color_lxx_dark">#80FFFFFF</color>

    <color name="highlight_color_lxx_dark">#80CBC4</color>

    <color name="typed_word_color_lxx_dark">#D880CBC4</color>

    <color name="suggested_word_color_lxx_dark">#B280CBC4</color>

    <color name="typed_word_color_lxx_dark">#D980CBC4</color>

    <color name="suggested_word_color_lxx_dark">#B380CBC4</color>

    <color name="highlight_translucent_color_lxx_dark">#9980CBC4</color>

    <color name="keyboard_background_lxx_dark">#263238</color>

    <color name="key_background_lxx_dark">#263238</color>

    <color name="key_background_pressed_lxx_dark">#26CFD8DC</color>

    <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>

    <color name="suggestions_strip_background_lxx_dark">#21272B</color>

    <color name="suggested_word_background_selected_lxx_dark">#26CFD8DC</color>

    <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>

    <color name="gesture_floating_preview_color_lxx_dark">#C0000000</color>

    <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>

    <!-- Color resources for setup wizard and tutorial -->

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

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 
        <item name="spacebarIconWidthRatio">0.9</item>

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

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

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

        <item name="functionalTextColor">@color/key_hint_letter_color_lxx_dark</item>

        <item name="keyTextInactivatedColor">@color/key_functional_text_color_lxx_dark</item>

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

        <item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_dark</item>

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
        <item name="keyTypeface">normal</item>

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

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

        <item name="functionalTextColor">@color/key_hint_letter_color_lxx_light</item>

        <item name="functionalTextColor">@color/key_functional_text_color_lxx_light</item>

        <item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_light</item>

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

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