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

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

Merge "Add language switch key to 10" tablet" into jb-mr1-dev

parents 6492a2f3 f6235167

java/res/xml-sw768dp/key_space.xml

+23 −2
Original line number Diff line number Diff line
@@ -24,15 +24,36 @@ 
    <switch>

        <case

            latin:languageCode="fa"

            latin:languageSwitchKeyEnabled="true"

        >

            <Key

                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="24.141%p" />

            <Key

                latin:keyStyle="zwnjKeyStyle" />

        </case>

        <case

            latin:languageCode="fa"

            latin:languageSwitchKeyEnabled="false"

        >

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="32.188%p" />

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

                 U+200D: "" ZERO WIDTH JOINER -->

            <Key

                latin:keyStyle="zwnjKeyStyle" />

        </case>

        <case

            latin:languageSwitchKeyEnabled="true"

        >

            <Key

                latin:keyStyle="languageSwitchKeyStyle" />

            <Key

                latin:keyStyle="spaceKeyStyle"

                latin:keyWidth="32.188%p" />

        </case>

         <!-- languageSwitchKeyEnabled="false" -->

        <default>

            <Key

                latin:keyStyle="spaceKeyStyle"

java/res/xml-sw768dp/key_styles_common.xml

+7 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
    <key-style

        latin:styleName="spaceKeyStyle"

        latin:code="!code/key_space"

        latin:keyActionFlags="noKeyPreview" />

        latin:keyActionFlags="noKeyPreview|enableLongPress" />

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

         U+200D: ZERO WIDTH JOINER -->

    <key-style
@@ -99,6 +99,12 @@ 
        latin:keyIconDisabled="!icon/shortcut_key_disabled"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="languageSwitchKeyStyle"

        latin:code="!code/key_language_switch"

        latin:keyIcon="!icon/language_switch_key"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"

        latin:altCode="!code/key_space" />

    <key-style

        latin:styleName="settingsKeyStyle"

        latin:code="!code/key_settings"