Integration tests for all keyboard add-ons

10 files changed, 116 insertions, 77 deletions

diff --git a/addons/languages/coptic/pack/src/main/res/xml/coptic.xml b/addons/languages/coptic/pack/src/main/res/xml/coptic.xml
index fae442c7f..fd86248d2 100644
--- a/addons/languages/coptic/pack/src/main/res/xml/coptic.xml
+++ b/addons/languages/coptic/pack/src/main/res/xml/coptic.xml
@@ -25,7 +25,7 @@
         <Key android:codes="772" android:keyEdgeFlags="right"/>
     </Row>
 
-    <Row>
+    <Row android:keyWidth="9.09%p">
         <Key android:codes="11393" android:keyEdgeFlags="left"/>
         <Key android:codes="11429"/>
         <Key android:codes="11399"/>
diff --git a/addons/languages/english/pack/src/main/res/xml/halmak.xml b/addons/languages/english/pack/src/main/res/xml/halmak.xml
index 7fe7e53fd..0d6cb8beb 100644
--- a/addons/languages/english/pack/src/main/res/xml/halmak.xml
+++ b/addons/languages/english/pack/src/main/res/xml/halmak.xml
@@ -69,7 +69,7 @@
             ask:hintLabel="0\u003E" />
     </Row>
 
-    <Row>
+    <Row android:keyWidth="9.09%p">
 
         <Key
             android:codes="115"
@@ -134,13 +134,6 @@
 
     <Row>
 
-        <!-- <Key
-            android:keyWidth="10%p"
-            android:codes="-1"
-            android:keyEdgeFlags="left"
-            android:isModifier="true"
-            android:isSticky="true" /> -->
-
         <Key
             android:codes="102"
             android:popupCharacters="ϕ"
@@ -193,11 +186,6 @@
             android:keyLabel="y"
             android:keyEdgeFlags="right" />
 
-        <!-- <Key
-            android:keyWidth="10%p"
-            android:codes="-5"
-            android:keyEdgeFlags="right"
-            android:isRepeatable="true"/> -->
     </Row>
     <Row android:rowEdgeFlags="bottom" android:keyboardMode="@integer/keyboard_mode_normal">
         <Key
@@ -207,11 +195,6 @@
             android:isSticky="true"
             android:keyWidth="20%p"/>
 
-        <!--<Key-->
-            <!--android:codes="-10"-->
-            <!--ask:longPressCode="-102"-->
-            <!--android:keyWidth="10%p"/>-->
-
         <Key
             android:codes="32"
             android:isRepeatable="true"
diff --git a/addons/languages/georgian/pack/src/main/res/xml/ka_gjuken_physical.xml b/addons/languages/georgian/pack/src/main/res/xml/ka_gjuken_physical.xml
index 3eb31cc52..868f70989 100644
--- a/addons/languages/georgian/pack/src/main/res/xml/ka_gjuken_physical.xml
+++ b/addons/languages/georgian/pack/src/main/res/xml/ka_gjuken_physical.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PhysicalTranslation QwertyTranslation="ღჯუკენგშწზხცძვთაკროლდჟჭჩყსმიტქბჰ">
+<PhysicalTranslation QwertyTranslation="ღჯუკენგშწზხცძვთაკროლდჟჭჩყს">
 
 </PhysicalTranslation>
diff --git a/addons/languages/german/pack/src/main/res/xml/de_qwertz.xml b/addons/languages/german/pack/src/main/res/xml/de_qwertz.xml
index 735d49caa..a9a6e87b0 100644
--- a/addons/languages/german/pack/src/main/res/xml/de_qwertz.xml
+++ b/addons/languages/german/pack/src/main/res/xml/de_qwertz.xml
@@ -4,7 +4,7 @@
     xmlns:ask="http://schemas.android.com/apk/res-auto"
     android:keyWidth="10%p">
     
-    <Row android:keyWidth="10%p">
+    <Row android:keyWidth="9.09%p">
         <Key android:codes="113" android:keyLabel="q" android:popupCharacters="\@1" android:keyEdgeFlags="left"/>
         <Key android:codes="119" android:keyLabel="w" android:popupCharacters="2"/>
         <Key android:codes="e"   android:keyLabel="e" android:popupKeyboard="@xml/de_popup_e" ask:hintLabel="€3"/>
diff --git a/addons/languages/german/pack/src/main/res/xml/german_keyboards.xml b/addons/languages/german/pack/src/main/res/xml/german_keyboards.xml
index f1417cc1f..1a63cb3ed 100644
--- a/addons/languages/german/pack/src/main/res/xml/german_keyboards.xml
+++ b/addons/languages/german/pack/src/main/res/xml/german_keyboards.xml
@@ -1,54 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Keyboards>
-    <Keyboard nameResId="@string/de_keyboard" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwertz" id="5a1b25da-c17d-4be1-ad8e-3e24333341ec"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_description"
-              index="1" defaultEnabled="true"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_broad" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwertz_broad" id="40f48890-e52f-11e6-9598-0800200c9a66"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_broad_description"
-              index="2" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_extra" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwertz_extra" id="5eb23620-e52f-11e6-9598-0800200c9a66"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_extra_description"
-              index="3" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_qwerty" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwerty" id="797fbddf-346b-4216-b67c-80834638d7ce"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_qwerty_description"
-              index="4" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_qwerty_broad" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwerty_broad" id="9f5e0409-849b-423c-8d5f-46acbfe4e934"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_qwerty_broad_description"
-              index="5" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_qwerty_extra" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwerty_extra" id="6755ccc0-1015-4364-bd87-2b755bf9ab4b"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_qwerty_extra_description"
-              index="6" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_qwerty_slim" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_qwerty_slim" id="33421de8-0d71-456c-90f1-3935fcb4e30f"
-              defaultDictionaryLocale="de" description="@string/de_keyboard_qwerty_slim_description"
-              index="7" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_physical" />
-    <Keyboard nameResId="@string/de_keyboard_neo2" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_neo2" id="ad1b5ffa-15cc-4ba4-abb7-68df2c0874e7"
-              defaultDictionaryLocale="de"
-              index="8" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_neo2_physical" />
-    <Keyboard nameResId="@string/de_keyboard_neo2_simple" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_neo2_simple" id="37606729-66c1-4e04-9968-b32314c7094a"
-              defaultDictionaryLocale="de"
-              index="9" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_neo2_physical" />
-    <Keyboard nameResId="@string/de_keyboard_adnw" iconResId="@drawable/ic_status_german"
-              layoutResId="@xml/de_adnw" id="e482c64e-fa24-45ab-a785-68c65fe5bf7b"
-              defaultDictionaryLocale="de"
-          description="@string/de_keyboard_adnw_description"
-              index="10" defaultEnabled="false"
-              physicalKeyboardMappingResId="@xml/german_neo2_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="true"
+        description="@string/de_keyboard_description"
+        iconResId="@drawable/ic_status_german"
+        id="5a1b25da-c17d-4be1-ad8e-3e24333341ec"
+        index="1"
+        layoutResId="@xml/de_qwertz"
+        nameResId="@string/de_keyboard"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_broad_description"
+        iconResId="@drawable/ic_status_german"
+        id="40f48890-e52f-11e6-9598-0800200c9a66"
+        index="2"
+        layoutResId="@xml/de_qwertz_broad"
+        nameResId="@string/de_keyboard_broad"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_extra_description"
+        iconResId="@drawable/ic_status_german"
+        id="5eb23620-e52f-11e6-9598-0800200c9a66"
+        index="3"
+        layoutResId="@xml/de_qwertz_extra"
+        nameResId="@string/de_keyboard_extra"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_qwerty_description"
+        iconResId="@drawable/ic_status_german"
+        id="797fbddf-346b-4216-b67c-80834638d7ce"
+        index="4"
+        layoutResId="@xml/de_qwerty"
+        nameResId="@string/de_keyboard_qwerty"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_qwerty_broad_description"
+        iconResId="@drawable/ic_status_german"
+        id="9f5e0409-849b-423c-8d5f-46acbfe4e934"
+        index="5"
+        layoutResId="@xml/de_qwerty_broad"
+        nameResId="@string/de_keyboard_qwerty_broad"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_qwerty_extra_description"
+        iconResId="@drawable/ic_status_german"
+        id="6755ccc0-1015-4364-bd87-2b755bf9ab4b"
+        index="6"
+        layoutResId="@xml/de_qwerty_extra"
+        nameResId="@string/de_keyboard_qwerty_extra"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_qwerty_slim_description"
+        iconResId="@drawable/ic_status_german"
+        id="33421de8-0d71-456c-90f1-3935fcb4e30f"
+        index="7"
+        layoutResId="@xml/de_qwerty_slim"
+        nameResId="@string/de_keyboard_qwerty_slim"
+        physicalKeyboardMappingResId="@xml/german_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="German NEO2 layout"
+        iconResId="@drawable/ic_status_german"
+        id="ad1b5ffa-15cc-4ba4-abb7-68df2c0874e7"
+        index="8"
+        layoutResId="@xml/de_neo2"
+        nameResId="@string/de_keyboard_neo2"
+        physicalKeyboardMappingResId="@xml/german_neo2_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        iconResId="@drawable/ic_status_german"
+        id="37606729-66c1-4e04-9968-b32314c7094a"
+        index="9"
+        layoutResId="@xml/de_neo2_simple"
+        nameResId="@string/de_keyboard_neo2_simple"
+        description="German NEO2 Simple layout with neo2 physical layout"
+        physicalKeyboardMappingResId="@xml/german_neo2_physical" />
+    <Keyboard
+        defaultDictionaryLocale="de"
+        defaultEnabled="false"
+        description="@string/de_keyboard_adnw_description"
+        iconResId="@drawable/ic_status_german"
+        id="e482c64e-fa24-45ab-a785-68c65fe5bf7b"
+        index="10"
+        layoutResId="@xml/de_adnw"
+        nameResId="@string/de_keyboard_adnw"
+        physicalKeyboardMappingResId="@xml/german_neo2_physical" />
 </Keyboards>
diff --git a/addons/languages/ossturkish/pack/src/main/java/com/anysoftkeyboard/languagepack/ossturkish/PackBroadcastReceiver.java b/addons/languages/ossturkish/pack/src/main/java/com/anysoftkeyboard/languagepack/ossturkish/PackBroadcastReceiver.java
index c4a2b23c3..0b9e5be2f 100644
--- a/addons/languages/ossturkish/pack/src/main/java/com/anysoftkeyboard/languagepack/ossturkish/PackBroadcastReceiver.java
+++ b/addons/languages/ossturkish/pack/src/main/java/com/anysoftkeyboard/languagepack/ossturkish/PackBroadcastReceiver.java
@@ -1,4 +1,4 @@
-package com.anysoftkeyboard.languagepack.spain;

+package com.anysoftkeyboard.languagepack.ossturkish;

 

 import com.anysoftkeyboard.addon.PackBroadcastReceiverBase;

 

diff --git a/addons/languages/romanian/pack/src/main/res/xml/romanian_keyboards.xml b/addons/languages/romanian/pack/src/main/res/xml/romanian_keyboards.xml
index 424c465f1..457a8cac2 100644
--- a/addons/languages/romanian/pack/src/main/res/xml/romanian_keyboards.xml
+++ b/addons/languages/romanian/pack/src/main/res/xml/romanian_keyboards.xml
@@ -7,5 +7,12 @@
      "iconResId" : a reference to a drawable which can be used to show a flag in the notification bar.

      "layoutResId" : a reference to a keyboard layout XML. See res/xml/qwerty.xml

      -->

-    <Keyboard nameResId="@string/romanian_keyboard_name" iconResId="@drawable/ic_status_romanian" layoutResId="@xml/romanian_qwerty" id="d9b53ba5-e694-4cac-b9ad-7080d88ca750" index="1" defaultDictionaryLocale="ro" description=""/>

+    <Keyboard

+        defaultDictionaryLocale="ro"

+        description="Romanian QWERTY layout"

+        iconResId="@drawable/ic_status_romanian"

+        id="d9b53ba5-e694-4cac-b9ad-7080d88ca750"

+        index="1"

+        layoutResId="@xml/romanian_qwerty"

+        nameResId="@string/romanian_keyboard_name" />

 </Keyboards>

diff --git a/addons/languages/russian2/pack/src/main/res/xml/cyrillic_physical.xml b/addons/languages/russian2/pack/src/main/res/xml/cyrillic_physical.xml
index 1f8652e37..9ee765c9a 100644
--- a/addons/languages/russian2/pack/src/main/res/xml/cyrillic_physical.xml
+++ b/addons/languages/russian2/pack/src/main/res/xml/cyrillic_physical.xml
@@ -44,7 +44,7 @@
     <!-- Shift+keycode_backslash - / -->
     <SequenceMapping keySequence="73" shiftModifier="true" targetChar="/"/>
     <!-- Shift+2 - " -->
-    <SequenceMapping keySequence="9" shiftModifier="true" targetChar="&quot;"/>
+    <SequenceMapping keySequence="9" shiftModifier="true" targetCharCode="34"/>
     <!-- Shift+3 - № -->
     <SequenceMapping keySequence="10" shiftModifier="true" targetChar="№"/>
     <!-- Shift+4 - ; -->
diff --git a/addons/languages/russian2/pack/src/main/res/xml/ru_physical.xml b/addons/languages/russian2/pack/src/main/res/xml/ru_physical.xml
index 7855006c9..39c3a0a9e 100644
--- a/addons/languages/russian2/pack/src/main/res/xml/ru_physical.xml
+++ b/addons/languages/russian2/pack/src/main/res/xml/ru_physical.xml
@@ -32,7 +32,7 @@
     <!-- Shift+keycode_backslash - / -->
     <SequenceMapping keySequence="73" shiftModifier="true" targetChar="/"/>
     <!-- Shift+2 - " -->
-    <SequenceMapping keySequence="9" shiftModifier="true" targetChar="&quot;"/>
+    <SequenceMapping keySequence="9" shiftModifier="true" targetCharCode="34"/>
     <!-- Shift+3 - № -->
     <SequenceMapping keySequence="10" shiftModifier="true" targetChar="№"/>
     <!-- Shift+4 - ; -->
diff --git a/addons/languages/tamazight/pack/src/main/res/xml/tamazight_ber_physical.xml b/addons/languages/tamazight/pack/src/main/res/xml/tamazight_ber_physical.xml
index 98eb83709..912e92f9d 100644
--- a/addons/languages/tamazight/pack/src/main/res/xml/tamazight_ber_physical.xml
+++ b/addons/languages/tamazight/pack/src/main/res/xml/tamazight_ber_physical.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<PhysicalTranslation QwertyTranslation="ⴰⵣⴻⵔⵜⵢⵓⵉⵄⵖⵇⵙⴷⴼⴳⵀⵊⴽⵍⵎⵡⵅⵛⵯⴱⵏⵝⴸⴿ" />
+<PhysicalTranslation QwertyTranslation="ⴰⵣⴻⵔⵜⵢⵓⵉⵄⵖⵇⵙⴷⴼⴳⵀⵊⴽⵍⵎⵡⵅⵛⵯⴱⵏ" />