Added new generation keyboard without apostroph

4 files changed, 107 insertions, 8 deletions

diff --git a/ime/app/src/main/res/values/strings.xml b/ime/app/src/main/res/values/strings.xml
index 4729e46f7..2a99b7abc 100644
--- a/ime/app/src/main/res/values/strings.xml
+++ b/ime/app/src/main/res/values/strings.xml
@@ -546,6 +546,7 @@
     <string name="extension_kbd_bottom_row_aosp">AOSP styled</string>
 
     <string name="extension_kbd_bottom_ng">New Generation - Testing</string>
+    <string name="extension_kbd_bottom_ng_no_apo">New Generation (without apostroph) - Testing</string>
     <string name="extension_kbd_extension_numbers_symbols">Numbers and symbols</string>
     <string name="extension_kbd_bottom_minimal">Minimal</string>
     <string name="extension_kbd_bottom_minimal_no_emoji">Minimal (no emoji)</string>
diff --git a/ime/app/src/main/res/xml/ext_kbd_bottom_row_ng_no_apo.xml b/ime/app/src/main/res/xml/ext_kbd_bottom_row_ng_no_apo.xml
new file mode 100644
index 000000000..f9a813c7b
--- /dev/null
+++ b/ime/app/src/main/res/xml/ext_kbd_bottom_row_ng_no_apo.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Keyboard
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:ask="http://schemas.android.com/apk/res-auto">
+    <!-- Generic bottom row -->
+    <Row android:keyboardMode="@integer/keyboard_mode_normal" android:rowEdgeFlags="bottom" android:keyWidth="10%p" android:keyHeight="@integer/key_normal_height">
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_keyboard_mode_change" android:keyEdgeFlags="left"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_mode_alphabet" ask:showInLayout="if_applicable"
+            ask:longPressCode="@integer/key_code_mode_alphabet_popup" ask:keyDynamicEmblem="icon"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_quick_text" ask:longPressCode="@integer/key_code_quick_text_popup"/>
+
+        <Key ask:isFunctional="true" android:codes="44" ask:shiftedCodes="46" android:popupCharacters=".:;-_()\u00b7\u2026\u2014"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_space" android:keyWidth="30%p"/>
+
+        <Key ask:isFunctional="true" android:codes="63" ask:shiftedCodes="33"
+             android:popupCharacters="!@/\u0026\u00a1\u00bf"/>
+
+        <Key ask:isFunctional="true" android:codes="46" ask:shiftedCodes="34" android:popupCharacters="&#34;\u201c\u201e\u201d\u2018\u2019\u00ab\u00bb"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_enter" android:keyEdgeFlags="right" ask:longPressCode="@integer/key_code_settings" />
+    </Row>
+    <Row android:keyboardMode="@integer/keyboard_mode_im" android:rowEdgeFlags="bottom" android:keyWidth="10%p" android:keyHeight="@integer/key_normal_height">
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_keyboard_mode_change" android:keyEdgeFlags="left"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_mode_alphabet" ask:showInLayout="if_applicable"
+            ask:longPressCode="@integer/key_code_mode_alphabet_popup" ask:keyDynamicEmblem="icon"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_quick_text" ask:longPressCode="@integer/key_code_quick_text_popup"/>
+
+        <Key ask:isFunctional="true" android:codes="44" ask:shiftedCodes="46" android:popupCharacters=".:;-_()\u00b7\u2026\u2014"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_space" android:keyWidth="30%p"/>
+
+        <Key ask:isFunctional="true" android:codes="63" ask:shiftedCodes="33" android:popupCharacters="!@/\u0026\u00a1\u00bf"/>
+
+        <Key ask:isFunctional="true" android:codes="39" ask:shiftedCodes="34" android:popupCharacters="&#34;\u201c\u201e\u201d\u2018\u2019\u00ab\u00bb"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_enter" android:keyEdgeFlags="right" ask:longPressCode="@integer/key_code_settings" />
+    </Row>
+
+    <Row android:keyboardMode="@integer/keyboard_mode_url" android:rowEdgeFlags="bottom" android:keyWidth="10%p" android:keyHeight="@integer/key_normal_height">
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_keyboard_mode_change" android:keyEdgeFlags="left"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_mode_alphabet" ask:showInLayout="if_applicable"
+            ask:longPressCode="@integer/key_code_mode_alphabet_popup" ask:keyDynamicEmblem="icon"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_domain"/>
+
+        <Key ask:isFunctional="true" android:codes="46" android:keyLabel="." android:popupCharacters=",-_"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_space" android:keyWidth="20%p"/>
+
+        <Key ask:isFunctional="true" android:codes="58" android:keyLabel=":"/>
+        <Key ask:isFunctional="true" android:codes="63" ask:shiftedCodes="33" android:popupCharacters="!/@\u0026\u00bf\u00a1"/>
+        <Key ask:isFunctional="true" android:codes="47" android:keyLabel="/"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_enter" android:keyEdgeFlags="right" ask:longPressCode="@integer/key_code_settings"/>
+    </Row>
+
+    <Row android:keyboardMode="@integer/keyboard_mode_email" android:rowEdgeFlags="bottom" android:keyWidth="10%p" android:keyHeight="@integer/key_normal_height">
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_keyboard_mode_change" android:keyEdgeFlags="left"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_mode_alphabet" ask:showInLayout="if_applicable"
+            ask:longPressCode="@integer/key_code_mode_alphabet_popup" ask:keyDynamicEmblem="icon"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_domain"/>
+
+        <Key ask:isFunctional="true" android:codes="64" android:keyLabel="\@"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_space" android:keyWidth="20%p"/>
+
+        <Key ask:isFunctional="true" android:codes="95" android:keyLabel="_"/>
+        <Key ask:isFunctional="true" android:codes="46" ask:shiftedCodes="46" android:popupCharacters=",()'-_"/>
+        <Key ask:isFunctional="true" android:codes="45" android:keyLabel="-"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_enter" android:keyEdgeFlags="right" ask:longPressCode="@integer/key_code_settings" />
+    </Row>
+    <Row android:keyboardMode="@integer/keyboard_mode_password" android:rowEdgeFlags="bottom" android:keyWidth="10%p" android:keyHeight="@integer/key_normal_height">
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_keyboard_mode_change" android:keyEdgeFlags="left"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_mode_alphabet" ask:showInLayout="if_applicable"
+            ask:longPressCode="@integer/key_code_mode_alphabet_popup" ask:keyDynamicEmblem="icon"/>
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_quick_text" ask:longPressCode="@integer/key_code_quick_text_popup"/>
+
+        <Key ask:isFunctional="true" android:codes="44" ask:shiftedCodes="46" android:popupCharacters=".:;-_()\u00b7\u2026\u2014"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_space" android:keyWidth="30%p"/>
+
+        <Key ask:isFunctional="true" android:codes="63" ask:shiftedCodes="33" android:popupCharacters="!@/\u0026\u00a1\u00bf"/>
+
+        <Key ask:isFunctional="true" android:codes="39" ask:shiftedCodes="34" android:popupCharacters="&#34;\u201c\u201e\u201d\u2018\u2019\u00ab\u00bb"/>
+
+        <Key ask:isFunctional="true" android:codes="@integer/key_code_enter" android:keyEdgeFlags="right" ask:longPressCode="@integer/key_code_settings" />
+    </Row>
+</Keyboard>
diff --git a/ime/app/src/main/res/xml/extension_keyboards.xml b/ime/app/src/main/res/xml/extension_keyboards.xml
index b8e19743f..ddd87c68d 100644
--- a/ime/app/src/main/res/xml/extension_keyboards.xml
+++ b/ime/app/src/main/res/xml/extension_keyboards.xml
@@ -149,12 +149,20 @@
         index="7"
         />
     <ExtensionKeyboard
-        id="d8657c90-d910-11e2-a28f-0800200c9a99"
+        id="66e1c3a5-42d7-48be-8f97-d2a3a9e38be9"
+        nameResId="@string/extension_kbd_bottom_ng_no_apo"
+        extensionKeyboardResId="@xml/ext_kbd_bottom_row_ng_no_apo"
+        extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
+        description=""
+        index="8"
+        />
+    <ExtensionKeyboard
+        id="d8657c90-d910-11e-2ae28f-0800200c9a99"
         nameResId="@string/extension_kbd_bottom_old"
         extensionKeyboardResId="@xml/ext_kbd_bottom_row_old"
         extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
         description=""
-        index="8"
+        index="9"
         />
     <ExtensionKeyboard
         id="c4abded0-db89-11e7-8f1a-0800200c9a66"
@@ -162,7 +170,7 @@
         extensionKeyboardResId="@xml/ext_kbd_bottom_row_simple"
         extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
         description=""
-        index="9"
+        index="10"
         />
     <ExtensionKeyboard
         id="a81483fe-8914-4a5a-9e5f-2e79265ff252"
@@ -170,7 +178,7 @@
         extensionKeyboardResId="@xml/ext_kbd_bottom_row_simple_alt"
         extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
         description=""
-        index="10"
+        index="11"
         />
     <ExtensionKeyboard
         id="f5326050-2471-42e0-a470-c5d52d08dc9d"
@@ -178,7 +186,7 @@
         extensionKeyboardResId="@xml/ext_kbd_bottom_row_minimal"
         extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
         description=""
-        index="11"
+        index="12"
         />
     <ExtensionKeyboard
         id="f50fee17-ad7a-4068-aff4-07e34ac68c52"
@@ -186,7 +194,7 @@
         extensionKeyboardResId="@xml/ext_kbd_bottom_row_minimal_no_emoji"
         extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
         description=""
-        index="12"
+        index="13"
         />
 
     <ExtensionKeyboard
@@ -195,7 +203,7 @@
         extensionKeyboardResId="@xml/ext_kbd_bottom_row_aosp"
         extensionKeyboardType="@integer/extension_keyboard_type_bottom_row"
         description=""
-        index="13"
+        index="14"
         />
 
 
diff --git a/ime/app/src/test/java/com/anysoftkeyboard/keyboardextensions/KeyboardExtensionFactoryTest.java b/ime/app/src/test/java/com/anysoftkeyboard/keyboardextensions/KeyboardExtensionFactoryTest.java
index 2b5dc9ead..392a933e9 100644
--- a/ime/app/src/test/java/com/anysoftkeyboard/keyboardextensions/KeyboardExtensionFactoryTest.java
+++ b/ime/app/src/test/java/com/anysoftkeyboard/keyboardextensions/KeyboardExtensionFactoryTest.java
@@ -74,7 +74,7 @@ public class KeyboardExtensionFactoryTest {
     public void testGetAllAvailableExtensions() throws Exception {
         assertBasicListDetails(
                 AnyApplication.getBottomRowFactory(getApplicationContext()).getAllAddOns(),
-                13,
+                14,
                 KeyboardExtension.TYPE_BOTTOM);
         assertBasicListDetails(
                 AnyApplication.getTopRowFactory(getApplicationContext()).getAllAddOns(),