From c7140793fc1c5d24b4214c898df9998fa25d988f Mon Sep 17 00:00:00 2001
From: lubomyr <lubomyr31@gmail.com>
Date: Fri, 27 Nov 2015 20:41:30 +0200
Subject: [PATCH] amiga keyboard layout uses new keyboard api

---
 project/java/MainActivity.java      |  6 +-
 project/res/xml/amiga_alt.xml       | 57 ++++++++++++++++++
 project/res/xml/amiga_alt_shift.xml | 57 ++++++++++++++++++
 project/res/xml/amiga_old.xml       | 90 +++++++++++++++++++++++++++++
 project/res/xml/amiga_shift.xml     | 53 +++++++++++++++++
 5 files changed, 260 insertions(+), 3 deletions(-)
 create mode 100644 project/res/xml/amiga_alt.xml
 create mode 100644 project/res/xml/amiga_alt_shift.xml
 create mode 100644 project/res/xml/amiga_old.xml
 create mode 100644 project/res/xml/amiga_shift.xml

diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 1a48b7984..50ad00a3c 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -495,9 +495,9 @@ public class MainActivity extends Activity
 	private int TextInputKeyboardList[][] =
 	{
 		{ 0, R.xml.qwerty, R.xml.c64, R.xml.amiga, R.xml.atari800 },
-		{ 0, R.xml.qwerty_shift, R.xml.c64, R.xml.amiga, R.xml.atari800 },
-		{ 0, R.xml.qwerty_alt, R.xml.c64, R.xml.amiga, R.xml.atari800 },
-		{ 0, R.xml.qwerty_alt_shift, R.xml.c64, R.xml.amiga, R.xml.atari800 }
+		{ 0, R.xml.qwerty_shift, R.xml.c64, R.xml.amiga_shift, R.xml.atari800 },
+		{ 0, R.xml.qwerty_alt, R.xml.c64, R.xml.amiga_alt, R.xml.atari800 },
+		{ 0, R.xml.qwerty_alt_shift, R.xml.c64, R.xml.amiga_alt_shift, R.xml.atari800 }
 	};
 
 	public void showScreenKeyboardWithoutTextInputField(final int keyboard)
diff --git a/project/res/xml/amiga_alt.xml b/project/res/xml/amiga_alt.xml
new file mode 100644
index 000000000..c5d49fafc
--- /dev/null
+++ b/project/res/xml/amiga_alt.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!-- When creating new keyboard layout, add it to TextInputKeyboardList array in project/java/MainActivity.java -->
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+	android:keyWidth="10%p"
+	android:horizontalGap="0px"
+	android:verticalGap="0px"
+	android:keyHeight="10%p">
+
+	<Row>
+		<Key android:codes="8"  android:keyLabel="1" android:keyEdgeFlags="left"/>
+		<Key android:codes="9"  android:keyLabel="2"/>
+		<Key android:codes="10" android:keyLabel="3"/>
+		<Key android:codes="11" android:keyLabel="4"/>
+		<Key android:codes="12" android:keyLabel="5"/>
+		<Key android:codes="13" android:keyLabel="6"/>
+		<Key android:codes="14" android:keyLabel="7"/>
+		<Key android:codes="15" android:keyLabel="8"/>
+		<Key android:codes="16" android:keyLabel="9"/>
+		<Key android:codes="7"  android:keyLabel="0" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row>
+		<Key android:codes="111"  android:keyLabel="Esc" android:keyEdgeFlags="left"/>
+		<Key android:codes="68"  android:keyLabel="'"/>
+		<Key android:codes="69"  android:keyLabel="-"/>
+		<Key android:codes="70"  android:keyLabel="="/>
+		<Key android:codes="73"  android:keyLabel="\\"/>
+		<Key android:codes="124" android:keyLabel="Ins"/>
+		<Key android:codes="92"  android:keyLabel="PgUp"/>
+		<Key android:codes="122" android:keyLabel="Home"/>
+		<Key android:codes="19"  android:keyLabel="↑"/>
+		<Key android:codes="123" android:keyLabel="End" android:keyEdgeFlags="right" />
+	</Row>
+	<Row>
+		<Key android:codes="-1"  android:keyLabel="!@#…" android:keyEdgeFlags="left"/>
+		<Key android:codes="75"  android:keyLabel="`"/>
+		<Key android:codes="100068"  android:keyLabel="&quot;"/>
+		<Key android:codes="61"  android:keyLabel="Tab"/>
+		<Key android:codes="115" android:keyLabel="CapsLk"/>
+		<Key android:codes="112" android:keyLabel="Del"/>
+		<Key android:codes="93"  android:keyLabel="PgDn"/>
+		<Key android:codes="21"  android:keyLabel="←"/>
+		<Key android:codes="20"  android:keyLabel="↓"/>
+		<Key android:codes="22"  android:keyLabel="→" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row android:rowEdgeFlags="bottom">
+		<Key android:codes="-6"  android:keyLabel="abc…"  android:keyEdgeFlags="left"/>
+		<Key android:codes="59"  android:keyLabel="Shift" android:isSticky="true"/>
+		<Key android:codes="113" android:keyLabel="Ctrl" android:isSticky="true"/>
+		<Key android:codes="117" android:keyLabel="Meta" android:isSticky="true"/>
+		<Key android:codes="57"  android:keyLabel="Alt" android:isSticky="true"/>
+		<Key android:codes="58"  android:keyLabel="Alt" android:isSticky="true"/>
+		<Key android:codes="118" android:keyLabel="Meta" android:isSticky="true"/>
+		<Key android:codes="226" android:keyLabel="Menu" android:isSticky="true"/>
+		<Key android:codes="114" android:keyLabel="Ctrl" android:isSticky="true"/>
+		<Key android:codes="60"  android:keyLabel="Shift" android:isSticky="true"/>
+	</Row>
+</Keyboard>
diff --git a/project/res/xml/amiga_alt_shift.xml b/project/res/xml/amiga_alt_shift.xml
new file mode 100644
index 000000000..4bfa5a779
--- /dev/null
+++ b/project/res/xml/amiga_alt_shift.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!-- When creating new keyboard layout, add it to TextInputKeyboardList array in project/java/MainActivity.java -->
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+	android:keyWidth="10%p"
+	android:horizontalGap="0px"
+	android:verticalGap="0px"
+	android:keyHeight="10%p">
+
+	<Row>
+		<Key android:codes="100008" android:keyLabel="!" android:keyEdgeFlags="left"/>
+		<Key android:codes="100009" android:keyLabel="\@"/>
+		<Key android:codes="100010" android:keyLabel="#"/>
+		<Key android:codes="100011" android:keyLabel="$"/>
+		<Key android:codes="100012" android:keyLabel="%"/>
+		<Key android:codes="100013" android:keyLabel="^"/>
+		<Key android:codes="100014" android:keyLabel="&amp;"/>
+		<Key android:codes="100015" android:keyLabel="*"/>
+		<Key android:codes="100016" android:keyLabel="("/>
+		<Key android:codes="100007" android:keyLabel=")" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row>
+		<Key android:codes="111"  android:keyLabel="Esc" android:keyEdgeFlags="left"/>
+		<Key android:codes="124"  android:keyLabel="Help"/>
+		<Key android:codes="100069"  android:keyLabel="_"/>
+		<Key android:codes="100070"  android:keyLabel="+"/>
+		<Key android:codes="100073"  android:keyLabel="|"/>
+		<Key android:codes="100075"  android:keyLabel="~"/>
+		<Key android:codes="131" android:keyLabel="F1"/>
+		<Key android:codes="132" android:keyLabel="F2"/>
+		<Key android:codes="133" android:keyLabel="F3"/>
+		<Key android:codes="134" android:keyLabel="F4" android:keyEdgeFlags="right" />
+	</Row>
+	<Row>
+		<Key android:codes="-1"  android:keyLabel="123…" android:keyEdgeFlags="left"/>
+		<Key android:codes="143" android:keyLabel="NumLk"/>
+		<Key android:codes="120" android:keyLabel="Print"/>
+		<Key android:codes="116" android:keyLabel="ScrollLk"/>
+		<Key android:codes="121" android:keyLabel="Pause"/>
+		<Key android:codes="158" android:keyLabel="Kp ."/>
+		<Key android:codes="135" android:keyLabel="F5"/>
+		<Key android:codes="136" android:keyLabel="F6"/>
+		<Key android:codes="137" android:keyLabel="F7"/>
+		<Key android:codes="138" android:keyLabel="F8" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row android:rowEdgeFlags="bottom">
+		<Key android:codes="-6"  android:keyLabel="abc…" android:keyEdgeFlags="left"/>
+		<Key android:codes="154" android:keyLabel="Kp /"/>
+		<Key android:codes="155" android:keyLabel="Kp *"/>
+		<Key android:codes="156" android:keyLabel="Kp -"/>
+		<Key android:codes="157" android:keyLabel="Kp +"/>
+		<Key android:codes="160" android:keyLabel="Kp ↵"/>
+		<Key android:codes="139" android:keyLabel="F9" />
+		<Key android:codes="140" android:keyLabel="F10"/>
+		<Key android:codes="141" android:keyLabel="F11"/>
+		<Key android:codes="142" android:keyLabel="F12" android:keyEdgeFlags="right"/>
+	</Row>
+</Keyboard>
diff --git a/project/res/xml/amiga_old.xml b/project/res/xml/amiga_old.xml
new file mode 100644
index 000000000..f6f1fd2d4
--- /dev/null
+++ b/project/res/xml/amiga_old.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!-- When creating new keyboard layout, add it to TextInputKeyboardList array in project/java/MainActivity.java -->
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+	android:keyWidth="10%p"
+	android:horizontalGap="0px"
+	android:verticalGap="0px"
+	android:keyHeight="10%p">
+	<Row>
+		<Key android:codes="111" android:keyLabel="ESC" android:keyEdgeFlags="left"/>
+		<Key android:codes="131" android:keyLabel="F1" />
+		<Key android:codes="132" android:keyLabel="F2" />
+		<Key android:codes="133" android:keyLabel="F3" />
+		<Key android:codes="134" android:keyLabel="F4" />
+		<Key android:codes="135" android:keyLabel="F5" />
+		<Key android:codes="136" android:keyLabel="F6" />
+		<Key android:codes="137" android:keyLabel="F7" />
+		<Key android:codes="138" android:keyLabel="F8" />
+		<Key android:codes="139" android:keyLabel="F9" />
+		<Key android:codes="140" android:keyLabel="F10" />
+		<Key android:codes="124" android:keyLabel="HELP" android:keyEdgeFlags="right"/>
+	</Row>
+
+	<Row>
+		<Key android:codes="75" android:keyLabel="`" android:keyEdgeFlags="left"/>
+		<Key android:codes="8" android:keyLabel="1"/>
+		<Key android:codes="9" android:keyLabel="2"/>
+		<Key android:codes="10" android:keyLabel="3"/>
+		<Key android:codes="11" android:keyLabel="4"/>
+		<Key android:codes="12" android:keyLabel="5"/>
+		<Key android:codes="13" android:keyLabel="6"/>
+		<Key android:codes="14" android:keyLabel="7"/>
+		<Key android:codes="15" android:keyLabel="8"/>
+		<Key android:codes="16" android:keyLabel="9"/>
+		<Key android:codes="7" android:keyLabel="0"/>
+		<Key android:codes="67" android:keyLabel="DEL" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row>
+		<Key android:codes="61" android:keyLabel="TAB" android:keyEdgeFlags="left"/>
+		<Key android:codes="45" android:keyLabel="q"/>
+		<Key android:codes="51" android:keyLabel="w"/>
+		<Key android:codes="33" android:keyLabel="e"/>
+		<Key android:codes="46" android:keyLabel="r"/>
+		<Key android:codes="48" android:keyLabel="t"/>
+		<Key android:codes="53" android:keyLabel="y"/>
+		<Key android:codes="49" android:keyLabel="u"/>
+		<Key android:codes="37" android:keyLabel="i"/>
+		<Key android:codes="43" android:keyLabel="o"/>
+		<Key android:codes="44" android:keyLabel="p"/>
+		<Key android:codes="66" android:keyLabel="RET" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row>
+		<Key android:codes="113" android:keyLabel="CTRL" android:keyEdgeFlags="left"/>
+		<Key android:codes="115" android:keyLabel="CL"/>
+		<Key android:codes="29" android:keyLabel="a"/>
+		<Key android:codes="47" android:keyLabel="s"/>
+		<Key android:codes="32" android:keyLabel="d"/>
+		<Key android:codes="34" android:keyLabel="f"/>
+		<Key android:codes="35" android:keyLabel="g"/>
+		<Key android:codes="36" android:keyLabel="h"/>
+		<Key android:codes="38" android:keyLabel="j"/>
+		<Key android:codes="39" android:keyLabel="k"/>
+		<Key android:codes="40" android:keyLabel="l"/>
+		<Key android:codes="74" android:keyLabel=";" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row>
+		<Key android:codes="59" android:keyLabel="SHFT" android:keyEdgeFlags="left"/>
+		<Key android:codes="54" android:keyLabel="z"/>
+		<Key android:codes="52" android:keyLabel="x"/>
+		<Key android:codes="31" android:keyLabel="c"/>
+		<Key android:codes="50" android:keyLabel="v"/>
+		<Key android:codes="30" android:keyLabel="b"/>
+		<Key android:codes="42" android:keyLabel="n"/>
+		<Key android:codes="41" android:keyLabel="m"/>
+		<Key android:codes="55" android:keyLabel=","/>
+		<Key android:codes="56" android:keyLabel="."/>
+		<Key android:codes="76" android:keyLabel="/"/>
+		<Key android:codes="60" android:keyLabel="SHFT" android:keyEdgeFlags="right"/>
+	</Row>
+	<Row android:rowEdgeFlags="bottom">
+		<Key android:codes="57" android:keyLabel="ALT" android:keyEdgeFlags="left"/>
+		<Key android:codes="68" android:keyLabel="'" />
+		<Key android:codes="73" android:keyLabel="\\"/>
+		<Key android:codes="69" android:keyLabel="-"/>
+		<Key android:codes="62" android:keyLabel="SPACE" android:keyWidth="30%p" />
+		<Key android:codes="70" android:keyLabel="="/>
+		<Key android:codes="71" android:keyLabel="["/>
+		<Key android:codes="72" android:keyLabel="]"/>
+		<Key android:codes="58" android:keyLabel="ALT" android:keyEdgeFlags="right"/>
+	</Row>
+</Keyboard>
diff --git a/project/res/xml/amiga_shift.xml b/project/res/xml/amiga_shift.xml
new file mode 100644
index 000000000..54b260a81
--- /dev/null
+++ b/project/res/xml/amiga_shift.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!-- When creating new keyboard layout, add it to TextInputKeyboardList array in project/java/MainActivity.java -->
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+	android:keyWidth="10%p"
+	android:horizontalGap="0px"
+	android:verticalGap="0px"
+	android:keyHeight="10%p">
+	<Row>
+		<Key android:codes="45" android:keyLabel="Q" android:keyEdgeFlags="left" android:isRepeatable="true"/>
+		<Key android:codes="51" android:keyLabel="W" android:isRepeatable="true"/>
+		<Key android:codes="33" android:keyLabel="E" android:isRepeatable="true"/>
+		<Key android:codes="46" android:keyLabel="R" android:isRepeatable="true"/>
+		<Key android:codes="48" android:keyLabel="T" android:isRepeatable="true"/>
+		<Key android:codes="53" android:keyLabel="Y" android:isRepeatable="true"/>
+		<Key android:codes="49" android:keyLabel="U" android:isRepeatable="true"/>
+		<Key android:codes="37" android:keyLabel="I" android:isRepeatable="true"/>
+		<Key android:codes="43" android:keyLabel="O" android:isRepeatable="true"/>
+		<Key android:codes="44" android:keyLabel="P" android:keyEdgeFlags="right" android:isRepeatable="true"/>
+	</Row>
+	<Row>
+		<Key android:codes="29" android:keyLabel="A" android:keyEdgeFlags="left" android:isRepeatable="true"/>
+		<Key android:codes="47" android:keyLabel="S" android:isRepeatable="true"/>
+		<Key android:codes="32" android:keyLabel="D" android:isRepeatable="true"/>
+		<Key android:codes="34" android:keyLabel="F" android:isRepeatable="true"/>
+		<Key android:codes="35" android:keyLabel="G" android:isRepeatable="true"/>
+		<Key android:codes="36" android:keyLabel="H" android:isRepeatable="true"/>
+		<Key android:codes="38" android:keyLabel="J" android:isRepeatable="true"/>
+		<Key android:codes="39" android:keyLabel="K" android:isRepeatable="true"/>
+		<Key android:codes="40" android:keyLabel="L" android:isRepeatable="true"/>
+		<Key android:codes="74" android:keyLabel=":" android:keyEdgeFlags="right" android:isRepeatable="true"/>
+	</Row>
+	<Row>
+		<Key android:codes="-1" android:keyLabel="⇫" android:keyEdgeFlags="left" android:isRepeatable="true"/>
+		<Key android:codes="54" android:keyLabel="Z" android:isRepeatable="true"/>
+		<Key android:codes="52" android:keyLabel="X" android:isRepeatable="true"/>
+		<Key android:codes="31" android:keyLabel="C" android:isRepeatable="true"/>
+		<Key android:codes="50" android:keyLabel="V" android:isRepeatable="true"/>
+		<Key android:codes="30" android:keyLabel="B" android:isRepeatable="true"/>
+		<Key android:codes="42" android:keyLabel="N" android:isRepeatable="true"/>
+		<Key android:codes="41" android:keyLabel="M" android:isRepeatable="true"/>
+		<Key android:codes="67" android:keyLabel="≪ ×" android:keyWidth="20%p" android:keyEdgeFlags="right" android:isRepeatable="true"/>
+	</Row>
+	<Row android:rowEdgeFlags="bottom">
+		<Key android:codes="-6" android:keyLabel="!@#…" android:keyEdgeFlags="left" android:isRepeatable="true"/>
+		<Key android:codes="71" android:keyLabel="{" android:isRepeatable="true"/>
+		<Key android:codes="72" android:keyLabel="}" android:isRepeatable="true"/>
+		<Key android:codes="76" android:keyLabel="\?" android:isRepeatable="true"/>
+		<Key android:codes="62" android:keyLabel="Space" android:keyWidth="20%p" android:isRepeatable="true"/>
+		<Key android:codes="55" android:keyLabel="&lt;" android:isRepeatable="true"/>
+		<Key android:codes="56" android:keyLabel="&gt;" android:isRepeatable="true"/>
+		<Key android:codes="66" android:keyLabel="Enter" android:keyWidth="20%p" android:keyEdgeFlags="right" android:isRepeatable="true"/>
+	</Row>
+</Keyboard>