am d3ef3f0a: Merge "Add missing letter THEH to Arabic keyboard layout" (b7c3c75e) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/rowkeys_arabic3.xml→java/res/xml-sw600dp/keys_arabic3_left.xml

+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="ئ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0621: "ء" ARABIC LETTER HAMZA -->
		<Key
		latin:keyLabel="ء"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
		<Key
		latin:keyLabel="ؤ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0631: "ر" ARABIC LETTER REH -->
		<Key
		latin:keyLabel="ر"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0630: "ذ" ARABIC LETTER THAL -->
		<Key
		latin:keyLabel="ذ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
		<Key
		latin:keyLabel="ى"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
		<Key
		latin:keyLabel="ة"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0648: "و" ARABIC LETTER WAW -->
		<Key
		latin:keyLabel="و"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0632: "ز" ARABIC LETTER ZAIN
		U+0698: "ژ" ARABIC LETTER JEH -->
		<Key
		latin:keyLabel="ز"
		latin:moreKeys="ژ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
		<Key
		latin:keyLabel="ظ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+062F: "د" ARABIC LETTER DAL -->
		<!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
		<Key
		latin:keyLabel="د"
		latin:keyLabel="ئ"
		latin:keyLabelFlags="fontNormal" />
		</merge>

java/res/xml-sw600dp/rowkeys_arabic1.xml

deleted100644 → 0

+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="ض"
		latin:keyHintLabel="1"
		latin:additionalMoreKeys="1,١"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0635: "ص" ARABIC LETTER SAD
		U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
		<Key
		latin:keyLabel="ص"
		latin:keyHintLabel="2"
		latin:additionalMoreKeys="2,٢"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+062B: "ث" ARABIC LETTER THEH
		U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
		<Key
		latin:keyLabel="ث"
		latin:keyHintLabel="3"
		latin:additionalMoreKeys="3,٣"
		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="ق"
		latin:keyHintLabel="4"
		latin:additionalMoreKeys="4,٤"
		latin:moreKeys="ڨ"
		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="ف"
		latin:keyHintLabel="5"
		latin:additionalMoreKeys="5,٥"
		latin:moreKeys="ڤ,ڢ,ڥ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+063A: "غ" ARABIC LETTER GHAIN
		U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
		<Key
		latin:keyLabel="غ"
		latin:keyHintLabel="6"
		latin:additionalMoreKeys="6,٦"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0639: "ع" ARABIC LETTER AIN
		U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
		<Key
		latin:keyLabel="ع"
		latin:keyHintLabel="7"
		latin:additionalMoreKeys="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+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
		<Key
		latin:keyLabel="ه"
		latin:keyHintLabel="8"
		latin:additionalMoreKeys="8,٨"
		latin:moreKeys="ﻫ\|ه‍"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+062E: "خ" ARABIC LETTER KHAH
		U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
		<Key
		latin:keyLabel="خ"
		latin:keyHintLabel="9"
		latin:additionalMoreKeys="9,٩"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+062D: "ح" ARABIC LETTER HAH
		U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
		<Key
		latin:keyLabel="ح"
		latin:keyHintLabel="0"
		latin:additionalMoreKeys="0,٠"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+062C: "ج" ARABIC LETTER JEEM
		U+0686: "چ" ARABIC LETTER TCHEH -->
		<Key
		latin:keyLabel="ج"
		latin:moreKeys="چ"
		latin:keyLabelFlags="fontNormal" />
		</merge>

java/res/xml-sw600dp/rowkeys_arabic2.xml

deleted100644 → 0

+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="ش"
		latin:moreKeys="ڜ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0633: "س" ARABIC LETTER SEEN -->
		<Key
		latin:keyLabel="س"
		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="ي"
		latin:moreKeys="ئ,ى"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0628: "ب" ARABIC LETTER BEH
		U+067E: "پ" ARABIC LETTER PEH -->
		<Key
		latin:keyLabel="ب"
		latin:moreKeys="پ"
		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="ل"
		latin:moreKeys="ﻻ\|لا,ﻷ\|لأ,ﻹ\|لإ,ﻵ\|لآ"
		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="ا"
		latin:moreKeys="ء,ٱ,أ,إ,آ"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+062A: "ت" ARABIC LETTER TEH -->
		<Key
		latin:keyLabel="ت"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0646: "ن" ARABIC LETTER NOON -->
		<Key
		latin:keyLabel="ن"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0645: "م" ARABIC LETTER MEEM -->
		<Key
		latin:keyLabel="م"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0643: "ك" ARABIC LETTER KAF
		U+06AF: "گ" ARABIC LETTER GAF
		U+06A9: "ک" ARABIC LETTER KEHEH -->
		<Key
		latin:keyLabel="ك"
		latin:moreKeys="گ,ک"
		latin:keyLabelFlags="fontNormal" />
		<!-- U+0637: "ط" ARABIC LETTER TAH -->
		<Key
		latin:keyLabel="ط"
		latin:keyLabelFlags="fontNormal" />
		</merge>

java/res/xml-sw600dp/rows_arabic.xml

+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" />

java/res/xml-sw768dp/rows_arabic.xml

+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" />