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

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

Merge "Make popup hint letter theme-aware" into lmp-dev

parents f69bb4c7 3410e169

java/res/values/attrs.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,9 @@ 
        <attr name="spacebarIconWidthRatio" format="float" />

        <attr name="spacebarIconWidthRatio" format="float" />

        <!-- Right padding of hint letter to the edge of the key.-->

        <!-- Right padding of hint letter to the edge of the key.-->

        <attr name="keyHintLetterPadding" format="dimension" />

        <attr name="keyHintLetterPadding" format="dimension" />

        <!-- Bottom padding of popup hint letter "..." to the edge of the key.-->

        <!-- Popup hint letter string-->

        <attr name="keyPopupHintLetter" format="string" />

        <!-- Bottom padding of popup hint letter to the edge of the key.-->

        <attr name="keyPopupHintLetterPadding" format="dimension" />

        <attr name="keyPopupHintLetterPadding" format="dimension" />

        <!-- Right padding of shifted letter hint to the edge of the key.-->

        <!-- Right padding of shifted letter hint to the edge of the key.-->

        <attr name="keyShiftedLetterHintPadding" format="dimension" />

        <attr name="keyShiftedLetterHintPadding" format="dimension" />

java/res/values/themes-ics.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ 
        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>

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

        <!-- A negative value to disable key text shadow layer. -->

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyTextShadowRadius">-1.0</item>

        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

        <item name="keyPopupHintLetter">&#x2026;</item>

    </style>

    </style>

    <style

    <style

        name="MainKeyboardView.ICS"

        name="MainKeyboardView.ICS"

java/res/values/themes-klp.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ 
        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>

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

        <!-- A negative value to disable key text shadow layer. -->

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyTextShadowRadius">-1.0</item>

        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

        <item name="keyPopupHintLetter">&#x2026;</item>

    </style>

    </style>

    <style

    <style

        name="MainKeyboardView.KLP"

        name="MainKeyboardView.KLP"

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ 
        <item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item>

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

        <!-- A negative value to disable key text shadow layer. -->

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyPopupHintLetter"></item> <!-- No popup hint letter -->

    </style>

    </style>

    <style

    <style

        name="MainKeyboardView.LXX_Dark"

        name="MainKeyboardView.LXX_Dark"

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ 
        <item name="keyPreviewTextColor">@color/key_text_color_lxx_light</item>

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

        <!-- A negative value to disable key text shadow layer. -->

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyPopupHintLetter"></item> <!-- No popup hint letter -->

    </style>

    </style>

    <style

    <style

        name="MainKeyboardView.LXX_Light"

        name="MainKeyboardView.LXX_Light"