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

Commit b7c3c75e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am d3ef3f0a: Merge "Add missing letter THEH to Arabic keyboard layout"

* commit 'd3ef3f0a':
  Add missing letter THEH to Arabic keyboard layout
parents a444698c d3ef3f0a
Loading
Loading
Loading
Loading
+32 −0
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
<!--
/*
**
** Copyright 2012, The Android Open Source Project
** Copyright 2013, 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.
@@ -21,50 +21,12 @@
<merge
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
    <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
    <Key
        latin:keyLabel="&#x0626;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
    <Key
        latin:keyLabel="&#x0621;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
    <Key
        latin:keyLabel="&#x0624;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0631: "ر" ARABIC LETTER REH -->
    <Key
        latin:keyLabel="&#x0631;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0630: "ذ" ARABIC LETTER THAL -->
    <Key
        latin:keyLabel="&#x0630;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
    <Key
        latin:keyLabel="&#x0649;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
    <Key
        latin:keyLabel="&#x0629;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0648: "و" ARABIC LETTER WAW -->
    <Key
        latin:keyLabel="&#x0648;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0632: "ز" ARABIC LETTER ZAIN
         U+0698: "ژ" ARABIC LETTER JEH -->
    <Key
        latin:keyLabel="&#x0632;"
        latin:moreKeys="&#x0698;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
    <Key
        latin:keyLabel="&#x0638;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+062F: "د" ARABIC LETTER DAL -->
    <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
    <Key
        latin:keyLabel="&#x062F;"
        latin:keyLabel="&#x0626;"
        latin:keyLabelFlags="fontNormal" />
</merge>
+0 −112
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+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+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+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+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+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+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+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+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+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+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 -->
    <Key
        latin:keyLabel="&#x062C;"
        latin:moreKeys="&#x0686;"
        latin:keyLabelFlags="fontNormal" />
</merge>
+0 −94
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+0634: "ش" ARABIC LETTER SHEEN
         U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
    <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
    <Key
        latin:keyLabel="&#x0634;"
        latin:moreKeys="&#x069C;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0633: "س" ARABIC LETTER SEEN -->
    <Key
        latin:keyLabel="&#x0633;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+064A: "ي" ARABIC LETTER YEH
         U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
         U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
    <Key
        latin:keyLabel="&#x064A;"
        latin:moreKeys="&#x0626;,&#x0649;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0628: "ب" ARABIC LETTER BEH
         U+067E: "پ" ARABIC LETTER PEH -->
    <Key
        latin:keyLabel="&#x0628;"
        latin:moreKeys="&#x067E;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0644: "ل" ARABIC LETTER LAM
         U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
         U+0627: "ا" ARABIC LETTER ALEF
         U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
         U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
         U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
         U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
         U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
         U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
    <Key
        latin:keyLabel="&#x0644;"
        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0627: "ا" ARABIC LETTER ALEF
         U+0621: "ء" ARABIC LETTER HAMZA
         U+0671: "ٱ" ARABIC LETTER ALEF WASLA
         U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
         U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
         U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
    <Key
        latin:keyLabel="&#x0627;"
        latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+062A: "ت" ARABIC LETTER TEH -->
    <Key
        latin:keyLabel="&#x062A;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0646: "ن" ARABIC LETTER NOON -->
    <Key
        latin:keyLabel="&#x0646;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0645: "م" ARABIC LETTER MEEM -->
    <Key
        latin:keyLabel="&#x0645;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0643: "ك" ARABIC LETTER KAF
         U+06AF: "گ" ARABIC LETTER GAF
         U+06A9: "ک" ARABIC LETTER KEHEH -->
    <Key
        latin:keyLabel="&#x0643;"
        latin:moreKeys="&#x06AF;,&#x06A9;"
        latin:keyLabelFlags="fontNormal" />
    <!-- U+0637: "ط" ARABIC LETTER TAH -->
    <Key
        latin:keyLabel="&#x0637;"
        latin:keyLabelFlags="fontNormal" />
</merge>
+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@
        latin:keyWidth="8.182%p"
    >
        <include
            latin:keyboardLayout="@xml/rowkeys_arabic3"
            latin:keyXPos="4.091%p" />
            latin:keyboardLayout="@xml/rowkeys_arabic3" />
    </Row>
    <include
        latin:keyboardLayout="@xml/row_qwerty4" />
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@
    >
        <include
            latin:keyboardLayout="@xml/rowkeys_arabic3"
            latin:keyXPos="13.829%p" />
            latin:keyXPos="6.602%p" />
    </Row>
    <include
        latin:keyboardLayout="@xml/row_qwerty4" />
Loading