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

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

Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint"

parents a3f2ce1f b03529aa

java/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -281,6 +281,10 @@ 
            <flag name="shiftedLetterActivated" value="0x10000" />

            <!-- If true, use EditorInfo.actionLabel for the key label. -->

            <flag name="fromCustomActionLabel" value="0x20000" />

            <!-- If true, disable keyHintLabel. -->

            <flag name="disableKeyHintLabel" value="0x40000000" />

            <!-- If true, disable additionalMoreKeys. -->

            <flag name="disableAdditionalMoreKeys" value="0x80000000" />

        </attr>

        <!-- The icon to display on the key instead of the label. -->

        <attr name="keyIcon" format="enum">

java/res/xml-sw600dp/rowkeys_azerty1.xml

deleted100644 → 0
+0 −53
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"

>

    <Key

        latin:keyLabel="a"

        latin:moreKeys="@string/more_keys_for_a" />

    <Key

        latin:keyLabel="z"

        latin:moreKeys="@string/more_keys_for_z" />

    <Key

        latin:keyLabel="e"

        latin:moreKeys="@string/more_keys_for_e" />

    <Key

        latin:keyLabel="r"

        latin:moreKeys="@string/more_keys_for_r" />

    <Key

        latin:keyLabel="t"

        latin:moreKeys="@string/more_keys_for_t" />

    <Key

        latin:keyLabel="y"

        latin:moreKeys="@string/more_keys_for_y" />

    <Key

        latin:keyLabel="u"

        latin:moreKeys="@string/more_keys_for_u" />

    <Key

        latin:keyLabel="i"

        latin:moreKeys="@string/more_keys_for_i" />

    <Key

        latin:keyLabel="o"

        latin:moreKeys="@string/more_keys_for_o" />

    <Key

        latin:keyLabel="p" />

</merge>

java/res/xml-sw600dp/rowkeys_bulgarian1.xml

deleted100644 → 0
+0 −59
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"

>

    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->

    <Key

        latin:keyLabel="&#x0447;" />

    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

    <Key

        latin:keyLabel="&#x0448;" />

    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->

    <Key

        latin:keyLabel="&#x0435;" />

    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->

    <Key

        latin:keyLabel="&#x0440;" />

    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->

    <Key

        latin:keyLabel="&#x0442;" />

    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->

    <Key

        latin:keyLabel="&#x044A;" />

    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->

    <Key

        latin:keyLabel="&#x0443;" />

    <!-- U+0438: "и" CYRILLIC SMALL LETTER I

         U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->

    <Key

        latin:keyLabel="&#x0438;"

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

    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->

    <Key

        latin:keyLabel="&#x043E;" />

    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->

    <Key

        latin:keyLabel="&#x043F;" />

    <!-- U+044F: "я" CYRILLIC SMALL LETTER YA -->

    <Key

        latin:keyLabel="&#x044F;" />

</merge>

java/res/xml-sw600dp/rowkeys_east_slavic1.xml

deleted100644 → 0
+0 −59
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"

>

    <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I -->

    <Key

        latin:keyLabel="&#x0439;" />

    <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->

    <Key

        latin:keyLabel="&#x0446;" />

    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->

    <Key

        latin:keyLabel="&#x0443;"

        latin:moreKeys="@string/more_keys_for_cyrillic_u" />

    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->

    <Key

        latin:keyLabel="&#x043A;" />

    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->

    <Key

        latin:keyLabel="&#x0435;"

        latin:moreKeys="@string/more_keys_for_cyrillic_ye" />

    <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->

    <Key

        latin:keyLabel="&#x043D;"

        latin:moreKeys="@string/more_keys_for_cyrillic_en" />

    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->

    <Key

        latin:keyLabel="&#x0433;" />

    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

    <Key

        latin:keyLabel="&#x0448;" />

    <Key

        latin:keyLabel="@string/keylabel_for_cyrillic_shcha" />

    <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->

    <Key

        latin:keyLabel="&#x0437;" />

    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->

    <Key

        latin:keyLabel="&#x0445;" />

</merge>

java/res/xml-sw600dp/rowkeys_georgian1.xml

deleted100644 → 0
+0 −111
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:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"

        >

            <Key

                latin:keyLabel="Q"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10ED: "ჭ" GEORGIAN LETTER CHAR -->

            <Key

                latin:keyLabel="&#x10ED;"

                latin:keyLabelFlags="preserveCase" />

            <Key

                latin:keyLabel="E"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10E6: "ღ" GEORGIAN LETTER GHAN -->

            <Key

                latin:keyLabel="&#x10E6;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10D7: "თ" GEORGIAN LETTER TAN -->

            <Key

                latin:keyLabel="&#x10D7;"

                latin:keyLabelFlags="preserveCase" />

            <Key

                latin:keyLabel="Y"

                latin:keyLabelFlags="preserveCase" />

            <Key

                latin:keyLabel="U"

                latin:keyLabelFlags="preserveCase" />

            <Key

                latin:keyLabel="I"

                latin:keyLabelFlags="preserveCase" />

            <Key

                latin:keyLabel="O"

                latin:keyLabelFlags="preserveCase" />

            <Key

                latin:keyLabel="P"

                latin:keyLabelFlags="preserveCase" />

        </case>

        <default>

            <!-- U+10E5: "ქ" GEORGIAN LETTER GHAN -->

            <Key

                latin:keyLabel="&#x10E5;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10EC: "წ" GEORGIAN LETTER CIL -->

            <Key

                latin:keyLabel="&#x10EC;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10D4: "ე" GEORGIAN LETTER EN

                 U+10F1: "ჱ" GEORGIAN LETTER HE -->

            <Key

                latin:keyLabel="&#x10D4;"

                latin:moreKeys="&#x10F1;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10E0: "რ" GEORGIAN LETTER RAE -->

            <Key

                latin:keyLabel="&#x10E0;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10E2: "ტ" GEORGIAN LETTER TAR -->

            <Key

                latin:keyLabel="&#x10E2;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10E7: "ყ" GEORGIAN LETTER QAR

                 U+10F8: "ჸ" GEORGIAN LETTER ELIFI -->

            <Key

                latin:keyLabel="&#x10E7;"

                latin:moreKeys="&#x10F8;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10E3: "უ" GEORGIAN LETTER UN -->

            <Key

                latin:keyLabel="&#x10E3;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10D8: "ი" GEORGIAN LETTER IN

                 U+10F2: "ჲ" GEORGIAN LETTER HIE -->

            <Key

                latin:keyLabel="&#x10D8;"

                latin:moreKeys="&#x10F2;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10DD: "ო" GEORGIAN LETTER ON -->

            <Key

                latin:keyLabel="&#x10DD;"

                latin:keyLabelFlags="preserveCase" />

            <!-- U+10DE: "პ" GEORGIAN LETTER PAR -->

            <Key

                latin:keyLabel="&#x10DE;"

                latin:keyLabelFlags="preserveCase" />

        </default>

    </switch>

</merge>