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

Commit 964877a8 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType attribute 

* commit 'c297197b':
  Add new value "spacebar" to Key.backgroundType attribute
parents e3552746 c297197b

java/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ 
            <enum name="stickyOff" value="3" />

            <enum name="stickyOn" value="4" />

            <enum name="action" value="5" />

            <enum name="spacebar" value="6" />

        </attr>

        <!-- The key action flags. -->

        <attr name="keyActionFlags" format="integer">

java/res/xml-sw600dp/key_styles_common.xml

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
    <key-style

        latin:styleName="spaceKeyStyle"

        latin:keySpec="!icon/space_key|!code/key_space"

        latin:backgroundType="spacebar"

        latin:keyActionFlags="noKeyPreview|enableLongPress" />

    <!-- U+200C: ZERO WIDTH NON-JOINER

         U+200D: ZERO WIDTH JOINER -->

java/res/xml-sw600dp/rows_number_normal.xml

+2 −3
Original line number Diff line number Diff line
@@ -141,9 +141,8 @@ 
    </Row>

    <Row>

        <Key

            latin:keyStyle="spaceKeyStyle"

            latin:keyWidth="30%p"

            latin:backgroundType="functional" />

            latin:keyStyle="tabletNumSpaceKeyStyle"

            latin:keyWidth="30%p" />

        <Key

            latin:keyStyle="numStarKeyStyle"

            latin:keyXPos="31%p" />

java/res/xml-sw600dp/rows_phone.xml

+2 −3
Original line number Diff line number Diff line
@@ -107,9 +107,8 @@ 
    </Row>

    <Row>

        <Key

            latin:keyStyle="spaceKeyStyle"

            latin:keyWidth="30%p"

            latin:backgroundType="functional" />

            latin:keyStyle="tabletNumSpaceKeyStyle"

            latin:keyWidth="30%p" />

        <Key

            latin:keyStyle="numStarKeyStyle"

            latin:keyXPos="31%p" />

java/res/xml/key_space_symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Key

        latin:backgroundType="normal"

        latin:keyStyle="spaceKeyStyle"

        latin:keyWidth="30%p" />

</merge>