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

Commit 49caddbd authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Support PC QWERTY layout 

Bug: 4460018
Change-Id: I9a29f6a322af66f6a152fa1883b3686c5f7a3328
parent cbaf6d85

java/res/values/donottranslate.xml

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
        <item>azerty</item>

        <item>dvorak</item>

        <item>colemak</item>

        <item>pcqwerty</item>

    </string-array>

    <!-- Predefined keyboard layout display names -->

    <string-array name="predefined_layout_display_names">
@@ -162,6 +163,7 @@ 
        <item>AZERTY</item>

        <item>Dvorak</item>

        <item>Colemak</item>

        <item>PC</item>

    </string-array>

    <!-- Description for generic subtype that has predefined layout.

         The string resource name must be "subtype_generic_<layout name>". -->
@@ -170,6 +172,7 @@ 
    <string name="subtype_generic_azerty">%s (AZERTY)</string>

    <string name="subtype_generic_dvorak">%s (Dvorak)</string>

    <string name="subtype_generic_colemak">%s (Colemak)</string>

    <string name="subtype_generic_pcqwerty">%s (PC)</string>



    <!-- dictionary pack package name /settings activity (for shared prefs and settings) -->

    <string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string>

java/res/xml-sw600dp/keys_pcqwerty2_right3.xml

0 → 100644
+58 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

        >

            <Key

                latin:keyLabel="["

                latin:moreKeys="{" />

            <Key

                latin:keyLabel="]"

                latin:moreKeys="}" />

            <!-- U+00A6: "¦" BROKEN BAR -->

            <Key

                latin:keyLabel="\\"

                latin:moreKeys="\\|,&#x00A6;" />

        </case>

        <default>

            <Key

                latin:keyLabel="["

                latin:keyHintLabel="{"

                latin:moreKeys="{"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <Key

                latin:keyLabel="]"

                latin:keyHintLabel="}"

                latin:moreKeys="}"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+00A6: "¦" BROKEN BAR -->

            <Key

                latin:keyLabel="\\"

                latin:keyHintLabel="|"

                latin:moreKeys="\\|,&#x00A6;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/keys_pcqwerty3_right2.xml

0 → 100644
+68 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

        >

            <Key

                latin:keyLabel=";"

                latin:moreKeys=":" />

            <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK

                 U+2019: "’" RIGHT SINGLE QUOTATION MARK

                 U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

                 U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK

                 U+201C: "“" LEFT DOUBLE QUOTATION MARK

                 U+201D: "”" RIGHT DOUBLE QUOTATION MARK

                 U+201E: "„" DOUBLE LOW-9 QUOTATION MARK

                 U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

            <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.

                 moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x2018;,&#x2019;,&#x201A;,&#x201B;" -->

            <Key

                latin:keyLabel="\'"

                latin:moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x2018;,&#x2019;,&#x201A;,&#x201B;,&quot;" />

        </case>

        <default>

            <Key

                latin:keyLabel=";"

                latin:keyHintLabel=":"

                latin:moreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK

                 U+2019: "’" RIGHT SINGLE QUOTATION MARK

                 U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

                 U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK

                 U+201C: "“" LEFT DOUBLE QUOTATION MARK

                 U+201D: "”" RIGHT DOUBLE QUOTATION MARK

                 U+201E: "„" DOUBLE LOW-9 QUOTATION MARK

                 U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

            <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.

                 moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x2018;,&#x2019;,&#x201A;,&#x201B;" -->

            <Key

                latin:keyLabel="\'"

                latin:keyHintLabel="&quot;"

                latin:moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x2018;,&#x2019;,&#x201A;,&#x201B;,&quot;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/keys_pcqwerty4_right3.xml

0 → 100644
+76 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <switch>

        <case

            latin:keyboardLayoutSetElement="symbols|symbolsShifted"

        >

            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

                 U+2264: "≤" LESS-THAN OR EQUAL TO

                 U+2265: "≥" GREATER-THAN EQUAL TO

                 U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

                 U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->

           <Key

                latin:keyLabel=","

                latin:additionalMoreKeys="&lt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x2039;,&#x2064;,&#x00AB;" />

            <Key

                latin:keyLabel="."

                latin:additionalMoreKeys="&gt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x203A;,&#x2065;,&#x00BB;" />

            <!-- U+00BF: "¿" INVERTED QUESTION MARK -->

            <Key

                latin:keyLabel="/"

                latin:additionalMoreKeys="\?"

                latin:moreKeys="&#x00BF;" />

        </case>

        <default>

            <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

                 U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

                 U+2264: "≤" LESS-THAN OR EQUAL TO

                 U+2265: "≥" GREATER-THAN EQUAL TO

                 U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

                 U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->

            <Key

                latin:keyLabel=","

                latin:keyHintLabel="&lt;"

                latin:additionalMoreKeys="&lt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x2039;,&#x2264;,&#x00AB;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <Key

                latin:keyLabel="."

                latin:keyHintLabel="&gt;"

                latin:additionalMoreKeys="&gt;"

                latin:moreKeys="!fixedColumnOrder!4,&#x203A;,&#x2265;,&#x00BB;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+00BF: "¿" INVERTED QUESTION MARK -->

            <Key

                latin:keyLabel="/"

                latin:keyHintLabel="\?"

                latin:additionalMoreKeys="\?"

                latin:moreKeys="&#x00BF;"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/row_pcqwerty5.xml

0 → 100644
+71 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<merge

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Row

        latin:keyWidth="7.0%p"

    >

        <switch>

            <case

                latin:keyboardLayoutSetElement="symbols|symbolsShifted"

            >

                <Spacer

                    latin:keyXPos="15.0%p"

                    latin:keyWidth="10.5%p" />

            </case>

            <case

                latin:mode="email|url"

            >

                <Key

                    latin:keyStyle="comKeyStyle"

                    latin:keyXPos="15.0%p"

                    latin:keyWidth="10.5%p" />

            </case>

            <default>

                <Spacer

                    latin:keyXPos="15.0%p"

                    latin:keyWidth="10.5%p" />

            </default>

        </switch>

        <switch>

            <case

                latin:languageSwitchKeyEnabled="true"

            >

                <Key

                    latin:keyStyle="languageSwitchKeyStyle" />

                <Key

                    latin:keyStyle="spaceKeyStyle"

                    latin:keyWidth="42.0%p" />

            </case>

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

            <default>

                <Key

                    latin:keyStyle="spaceKeyStyle"

                    latin:keyWidth="49.0%p" />

            </default>

        </switch>

        <include

            latin:keyXPos="-9.0%p"

            latin:keyWidth="fillRight"

            latin:keyboardLayout="@xml/key_shortcut" />

    </Row>

</merge>