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

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

Merge "ZWNJ key on Persian shouldn't be altCodeWhileTyping key"

parents 7b2d6a8f f71c2cfb

java/res/xml-sw600dp/key_styles_common.xml

+1 −3
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ 
        latin:styleName="zwnjKeyStyle"

        latin:keyLabel="‌"

        latin:moreKeys="‍"

        latin:keyLabelFlags="hasPopupHint"

        latin:altCode="@integer/key_space"

        latin:keyActionFlags="altCodeWhileTyping" />

        latin:keyLabelFlags="hasPopupHint" />

    <key-style

        latin:styleName="smileyKeyStyle"

        latin:keyLabel=":-)"

java/res/xml-sw768dp/key_styles_common.xml

+1 −3
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ 
        latin:styleName="zwnjKeyStyle"

        latin:keyLabel="&#x200C;"

        latin:moreKeys="&#x200D;"

        latin:keyLabelFlags="hasPopupHint"

        latin:altCode="@integer/key_space"

        latin:keyActionFlags="altCodeWhileTyping" />

        latin:keyLabelFlags="hasPopupHint" />

    <key-style

        latin:styleName="smileyKeyStyle"

        latin:keyLabel=":-)"

java/res/xml/key_styles_common.xml

+0 −2
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ 
        latin:keyLabel="&#x200C;"

        latin:moreKeys="&#x200D;"

        latin:keyLabelFlags="hasPopupHint"

        latin:altCode="@integer/key_space"

        latin:keyActionFlags="altCodeWhileTyping"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="shortcutKeyStyle"