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

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

Merge "Enable long-press digit input for tablets"

parents 940cca4f ecd3b514

java/res/xml-sw600dp/keys_dvorak_123.xml

+36 −16
Original line number Diff line number Diff line
@@ -21,20 +21,40 @@ 
<merge

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

>

    <switch>

        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <Key

                latin:keyLabel="&quot;"

                latin:keyHintLabel="1"

                latin:additionalMoreKeys="1" />

            <Key

                latin:keyLabel="&lt;"

                latin:keyHintLabel="2"

                latin:additionalMoreKeys="2" />

            <Key

                latin:keyLabel="&gt;"

                latin:keyHintLabel="3"

                latin:additionalMoreKeys="3" />

        </case>

        <default>

            <Key

                latin:keyLabel="\'"

        latin:keyHintLabel="&quot;"

        latin:moreKeys="!"

        latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyHintLabel="1"

                latin:additionalMoreKeys="1"

                latin:moreKeys="!,&quot;" />

            <Key

                latin:keyLabel=","

        latin:keyHintLabel="&lt;"

        latin:moreKeys="\?"

        latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:keyHintLabel="2"

                latin:additionalMoreKeys="2"

                latin:moreKeys="\?,&lt;" />

            <Key

                latin:keyLabel="."

        latin:keyHintLabel="&gt;"

                latin:keyHintLabel="3"

                latin:additionalMoreKeys="3"

                latin:keyLabelFlags="hasPopupHint|preserveCase"

        latin:moreKeys="!text/more_keys_for_punctuation"

        latin:keyStyle="hasShiftedLetterHintStyle" />

                latin:moreKeys="!text/more_keys_for_punctuation,%,&gt;" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/rowkeys_arabic1.xml

+40 −10
Original line number Diff line number Diff line
@@ -21,57 +21,87 @@ 
<merge

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

>

    <!-- U+0636: "ض" ARABIC LETTER DAD -->

    <!-- U+0636: "ض" ARABIC LETTER DAD

         U+0661: "١" ARABIC-INDIC DIGIT ONE -->

    <Key

        latin:keyLabel="&#x0636;"

        latin:keyHintLabel="1"

        latin:additionalMoreKeys="1,&#x0661;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0635: "ص" ARABIC LETTER SAD -->

    <!-- U+0635: "ص" ARABIC LETTER SAD

         U+0662: "٢" ARABIC-INDIC DIGIT TWO -->

    <Key

        latin:keyLabel="&#x0635;"

        latin:keyHintLabel="2"

        latin:additionalMoreKeys="2,&#x0662;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062B: "ث" ARABIC LETTER THEH -->

    <!-- U+062B: "ث" ARABIC LETTER THEH

         U+0663: "٣" ARABIC-INDIC DIGIT THREE -->

    <Key

        latin:keyLabel="&#x062B;"

        latin:keyHintLabel="3"

        latin:additionalMoreKeys="3,&#x0663;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0642: "ق" ARABIC LETTER QAF

         U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->

         U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE

         U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->

    <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->

    <Key

        latin:keyLabel="&#x0642;"

        latin:keyHintLabel="4"

        latin:additionalMoreKeys="4,&#x0664;"

        latin:moreKeys="&#x06A8;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0641: "ف" ARABIC LETTER FEH

         U+06A4: "ڤ" ARABIC LETTER VEH

         U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW

         U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->

         U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW

         U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->

    <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->

    <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->

    <Key

        latin:keyLabel="&#x0641;"

        latin:keyHintLabel="5"

        latin:additionalMoreKeys="5,&#x0665;"

        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+063A: "غ" ARABIC LETTER GHAIN -->

    <!-- U+063A: "غ" ARABIC LETTER GHAIN

         U+0666: "٦" ARABIC-INDIC DIGIT SIX -->

    <Key

        latin:keyLabel="&#x063A;"

        latin:keyHintLabel="6"

        latin:additionalMoreKeys="6,&#x0666;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0639: "ع" ARABIC LETTER AIN -->

    <!-- U+0639: "ع" ARABIC LETTER AIN

         U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->

    <Key

        latin:keyLabel="&#x0639;"

        latin:keyHintLabel="7"

        latin:additionalMoreKeys="7,&#x0667;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0647: "ه" ARABIC LETTER HEH

         U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM

         U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->

         U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER

         U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->

    <Key

        latin:keyLabel="&#x0647;"

        latin:keyHintLabel="8"

        latin:additionalMoreKeys="8,&#x0668;"

        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062E: "خ" ARABIC LETTER KHAH -->

    <!-- U+062E: "خ" ARABIC LETTER KHAH

         U+0669: "٩" ARABIC-INDIC DIGIT NINE -->

    <Key

        latin:keyLabel="&#x062E;"

        latin:keyHintLabel="9"

        latin:additionalMoreKeys="9,&#x0669;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062D: "ح" ARABIC LETTER HAH -->

    <!-- U+062D: "ح" ARABIC LETTER HAH

         U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->

    <Key

        latin:keyLabel="&#x062D;"

        latin:keyHintLabel="0"

        latin:additionalMoreKeys="0,&#x0660;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062C: "ج" ARABIC LETTER JEEM

         U+0686: "چ" ARABIC LETTER TCHEH -->

java/res/xml-sw600dp/rowkeys_farsi1.xml

+40 −10
Original line number Diff line number Diff line
@@ -21,50 +21,80 @@ 
<merge

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

>

    <!-- U+0636: "ض" ARABIC LETTER DAD -->

    <!-- U+0636: "ض" ARABIC LETTER DAD

         U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->

    <Key

        latin:keyLabel="&#x0636;"

        latin:keyHintLabel="&#x06F1;"

        latin:additionalMoreKeys="&#x06F1;,1"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0635: "ص" ARABIC LETTER SAD -->

    <!-- U+0635: "ص" ARABIC LETTER SAD

         U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->

    <Key

        latin:keyLabel="&#x0635;"

        latin:keyHintLabel="&#x06F2;"

        latin:additionalMoreKeys="&#x06F2;,2"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062B: "ث" ARABIC LETTER THEH -->

    <!-- U+062B: "ث" ARABIC LETTER THEH

         U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->

    <Key

        latin:keyLabel="&#x062B;"

        latin:keyHintLabel="&#x06F3;"

        latin:additionalMoreKeys="&#x06F3;,3"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0642: "ق" ARABIC LETTER QAF -->

    <!-- U+0642: "ق" ARABIC LETTER QAF

         U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->

    <Key

        latin:keyLabel="&#x0642;"

        latin:keyHintLabel="&#x06F4;"

        latin:additionalMoreKeys="&#x06F4;,4"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0641: "ف" ARABIC LETTER FEH -->

    <!-- U+0641: "ف" ARABIC LETTER FEH

         U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->

    <Key

        latin:keyLabel="&#x0641;"

        latin:keyHintLabel="&#x06F5;"

        latin:additionalMoreKeys="&#x06F5;,5"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+063A: "غ" ARABIC LETTER GHAIN -->

    <!-- U+063A: "غ" ARABIC LETTER GHAIN

         U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->

    <Key

        latin:keyLabel="&#x063A;"

        latin:keyHintLabel="&#x06F6;"

        latin:additionalMoreKeys="&#x06F6;,6"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0639: "ع" ARABIC LETTER AIN -->

    <!-- U+0639: "ع" ARABIC LETTER AIN

         U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->

    <Key

        latin:keyLabel="&#x0639;"

        latin:keyHintLabel="&#x06F7;"

        latin:additionalMoreKeys="&#x06F7;,7"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0647: "ه" ARABIC LETTER HEH

         U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM

         U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER

         U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE

         U+0629: "ة" ARABIC LETTER TEH MARBUTA -->

         U+0629: "ة" ARABIC LETTER TEH MARBUTA

         U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->

    <Key

        latin:keyLabel="&#x0647;"

        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"

        latin:keyHintLabel="&#x06F8;"

        latin:additionalMoreKeys="&#x06F8;,8"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062E: "خ" ARABIC LETTER KHAH -->

    <!-- U+062E: "خ" ARABIC LETTER KHAH

         U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->

    <Key

        latin:keyLabel="&#x062E;"

        latin:keyHintLabel="&#x06F9;"

        latin:additionalMoreKeys="&#x06F9;,9"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062D: "ح" ARABIC LETTER HAH -->

    <!-- U+062D: "ح" ARABIC LETTER HAH

         U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->

    <Key

        latin:keyLabel="&#x062D;"

        latin:keyHintLabel="&#x06F0;"

        latin:additionalMoreKeys="&#x06F0;,0"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062C: "ج" ARABIC LETTER JEEM -->

    <Key

java/res/xml-sw600dp/rows_azerty.xml

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
        latin:keyWidth="9.0%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_azerty1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />

java/res/xml-sw600dp/rows_bulgarian.xml

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
        latin:keyWidth="8.182%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_bulgarian1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />