Added `Navigation alt` top row

3 files changed, 61 insertions, 15 deletions

diff --git a/ime/app/src/main/res/values/strings.xml b/ime/app/src/main/res/values/strings.xml
index 3ea5df5fd..e39d2c1f7 100644
--- a/ime/app/src/main/res/values/strings.xml
+++ b/ime/app/src/main/res/values/strings.xml
@@ -523,6 +523,7 @@
     <string name="extension_kbd_top_small_numbers">Numbers keys</string>
     <string name="extension_kbd_top_numbers_alt">Alternate number keys</string>
     <string name="extension_kbd_top_nav">Navigation keys</string>
+    <string name="extension_kbd_top_nav_alt">Navigation keys alternative</string>
     <string name="extension_kbd_top_numbers_simple">Simple, numbers only</string>
     <string name="extension_kbd_top_terminal">Terminal</string>
     <string name="extension_kbd_top_text_editing">Quick text editing</string>
diff --git a/ime/app/src/main/res/xml/ext_kbd_top_row_nav_alt.xml b/ime/app/src/main/res/xml/ext_kbd_top_row_nav_alt.xml
new file mode 100644
index 000000000..6f6ec152a
--- /dev/null
+++ b/ime/app/src/main/res/xml/ext_kbd_top_row_nav_alt.xml
@@ -0,0 +1,35 @@
+<?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">
+    <Row android:rowEdgeFlags="top"
+         android:keyHeight="@integer/key_short_height">
+        <Key android:keyWidth="15%p" ask:isFunctional="true" android:codes="@integer/key_code_tab" ask:hintLabel=" "
+             android:keyEdgeFlags="left"/>
+        <Key android:keyWidth="15%p" ask:isFunctional="true"
+             android:codes="@integer/key_code_arrow_up" android:isRepeatable="true" ask:hintLabel=" "/>
+        <Key android:keyWidth="15%p" ask:isFunctional="true" android:codes="@integer/key_code_arrow_down"
+             android:isRepeatable="true" ask:hintLabel=" "/>
+        <Key android:keyWidth="20%p" ask:isFunctional="true" android:codes="@integer/key_code_arrow_left"
+             android:isRepeatable="true" ask:hintLabel=" "/>
+        <Key android:keyWidth="20%p" ask:isFunctional="true" android:codes="@integer/key_code_arrow_right"
+             android:isRepeatable="true" ask:hintLabel=" "/>
+        <Key android:keyWidth="15%p"  ask:isFunctional="true" android:codes="@integer/key_code_ctrl"
+             android:isRepeatable="true" ask:hintLabel=" "  android:keyEdgeFlags="right"/>
+
+    </Row>
+    <Row android:keyboardMode="@integer/keyboard_mode_password" android:rowEdgeFlags="top" android:keyWidth="10%p"
+    android:keyHeight="@integer/key_short_height">
+        <Key android:codes="49" android:keyLabel="1" ask:shiftedCodes="33" android:keyEdgeFlags="left"/>
+        <Key android:codes="50" android:keyLabel="2" ask:shiftedCodes="64"/>
+        <Key android:codes="51" android:keyLabel="3" ask:shiftedCodes="35"/>
+        <Key android:codes="52" android:keyLabel="4" ask:shiftedCodes="36"/>
+        <Key android:codes="53" android:keyLabel="5" ask:shiftedCodes="37"/>
+        <Key android:codes="54" android:keyLabel="6" ask:shiftedCodes="94"/>
+        <Key android:codes="55" android:keyLabel="7" ask:shiftedCodes="38"/>
+        <Key android:codes="56" android:keyLabel="8" ask:shiftedCodes="42"/>
+        <Key android:codes="57" android:keyLabel="9" ask:shiftedCodes="40"/>
+        <Key android:codes="48" android:keyLabel="0" ask:shiftedCodes="41" android:keyEdgeFlags="right"/>
+    </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 1818895e5..99553fe7c 100644
--- a/ime/app/src/main/res/xml/extension_keyboards.xml
+++ b/ime/app/src/main/res/xml/extension_keyboards.xml
@@ -50,29 +50,38 @@
             index="6"
             />
     <ExtensionKeyboard
+            id="f926cc04-c8ba-4392-8000-e52b8abb7093"
+            nameResId="@string/extension_kbd_top_nav_alt"
+            extensionKeyboardResId="@xml/ext_kbd_top_row_nav_alt"
+            extensionKeyboardType="2"
+            description=""
+            index="7"
+    />
+    <ExtensionKeyboard
             id="d9d6f590-db8b-11e7-8f1a-0800200c9a66"
             nameResId="@string/extension_kbd_top_numbers_simple"
             extensionKeyboardResId="@xml/ext_kbd_top_row_numbers_simple"
             extensionKeyboardType="@integer/extension_keyboard_type_top_row"
             description=""
-            index="7"
+            index="8"
             />
     <ExtensionKeyboard
-        id="49c8c4b0-b3bc-11e8-933e-975e4dcf2c13"
-        nameResId="@string/extension_kbd_top_terminal"
-        extensionKeyboardResId="@xml/ext_kbd_top_row_terminal"
-        extensionKeyboardType="2"
-        description=""
-        index="8"
-        />
+            id="49c8c4b0-b3bc-11e8-933e-975e4dcf2c13"
+            nameResId="@string/extension_kbd_top_terminal"
+            extensionKeyboardResId="@xml/ext_kbd_top_row_terminal"
+            extensionKeyboardType="2"
+            description=""
+            index="9"
+            />
     <ExtensionKeyboard
-        id="16bbcd88-5532-4fd6-92ff-db57977dd815"
-        nameResId="@string/extension_kbd_top_text_editing"
-        extensionKeyboardResId="@xml/ext_kbd_top_row_text_editing"
-        extensionKeyboardType="@integer/extension_keyboard_type_top_row"
-        description=""
-        index="9"
-        />
+            id="16bbcd88-5532-4fd6-92ff-db57977dd815"
+            nameResId="@string/extension_kbd_top_text_editing"
+            extensionKeyboardResId="@xml/ext_kbd_top_row_text_editing"
+            extensionKeyboardType="@integer/extension_keyboard_type_top_row"
+            description=""
+            index="10"
+            />
+
 
     <!-- bottom rows -->
     <ExtensionKeyboard
@@ -164,6 +173,7 @@
         index="11"
     />
 
+
     <!-- top extension keyboards -->
     <ExtensionKeyboard
             id="6f1ecea0-dee2-11e0-9572-0800200c9a66"