From 00d1f88ef967fd17eee14441176b1a36881d8b1d Mon Sep 17 00:00:00 2001
From: lubomyr <lubomyr31@gmail.com>
Date: Wed, 29 Jul 2015 22:19:11 +0000
Subject: [PATCH 1/4] c64 keyboard layout updated

---
 project/res/xml/c64.xml | 113 ++++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 45 deletions(-)

diff --git a/project/res/xml/c64.xml b/project/res/xml/c64.xml
index fbb4bae46..8be215e4a 100644
--- a/project/res/xml/c64.xml
+++ b/project/res/xml/c64.xml
@@ -5,59 +5,82 @@
 	android:horizontalGap="0px"
 	android:verticalGap="0px"
 	android:keyHeight="10%p">
+	
 	<Row>
-		<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
-		<Key android:codes="50" android:keyLabel="2"/>
-		<Key android:codes="51" android:keyLabel="3"/>
-		<Key android:codes="52" android:keyLabel="4"/>
-		<Key android:codes="53" android:keyLabel="5"/>
-		<Key android:codes="54" android:keyLabel="6"/>
-		<Key android:codes="55" android:keyLabel="7"/>
-		<Key android:codes="56" android:keyLabel="8"/>
-		<Key android:codes="57" android:keyLabel="9"/>
-		<Key android:codes="48" android:keyLabel="0" android:keyEdgeFlags="right"/>
+		<Key android:codes="0" android:keyLabel="C=" android:keyEdgeFlags="left"/>
+		<Key android:codes="111" android:keyLabel="RS" />
+		<Key android:codes="0" android:keyLabel="CTRL" />
+		<Key android:codes="102" android:keyLabel="F1" />
+		<Key android:codes="103" android:keyLabel="F3" />
+		<Key android:codes="104" android:keyLabel="F5" />
+		<Key android:codes="105" android:keyLabel="F7" />
+		<Key android:codes="3" android:keyLabel="Home" />
+		<Key android:codes="71" android:keyLabel="\@" />
+		<Key android:codes="67" android:keyLabel="DEL" android:keyEdgeFlags="right"/>
+	</Row>
+	
+	<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" />
+		<Key android:codes="69" android:keyLabel="+" />
+		<Key android:codes="70" android:keyLabel="-" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
-		<Key android:codes="119" android:keyLabel="w"/>
-		<Key android:codes="101" android:keyLabel="e"/>
-		<Key android:codes="114" android:keyLabel="r"/>
-		<Key android:codes="116" android:keyLabel="t"/>
-		<Key android:codes="121" android:keyLabel="y"/>
-		<Key android:codes="117" android:keyLabel="u"/>
-		<Key android:codes="105" android:keyLabel="i"/>
-		<Key android:codes="111" android:keyLabel="o"/>
-		<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+		<Key android:codes="45" android:keyLabel="q" android:keyEdgeFlags="left"/>
+		<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="72" android:keyLabel="*"/>
+		<Key android:codes="0" android:keyLabel="RST" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left"/>
-		<Key android:codes="115" android:keyLabel="s"/>
-		<Key android:codes="100" android:keyLabel="d"/>
-		<Key android:codes="102" android:keyLabel="f"/>
-		<Key android:codes="103" android:keyLabel="g"/>
-		<Key android:codes="104" android:keyLabel="h"/>
-		<Key android:codes="106" android:keyLabel="j"/>
-		<Key android:codes="107" android:keyLabel="k"/>
-		<Key android:codes="108" android:keyLabel="l"/>
-		<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>
+		<Key android:codes="0" android:keyLabel="SL" android:keyEdgeFlags="left"/>
+		<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=":"/>
+		<Key android:codes="75" android:keyLabel=";" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="-1" android:keyLabel="CAPS" android:keyEdgeFlags="left"/>
-		<Key android:codes="122" android:keyLabel="z"/>
-		<Key android:codes="120" android:keyLabel="x"/>
-		<Key android:codes="99" android:keyLabel="c"/>
-		<Key android:codes="118" android:keyLabel="v"/>
-		<Key android:codes="98" android:keyLabel="b"/>
-		<Key android:codes="110" android:keyLabel="n"/>
-		<Key android:codes="109" android:keyLabel="m"/>
-		<Key android:codes="46" android:keyLabel="."/>
-		<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>
+		<Key android:codes="0" 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="56" android:keyLabel=","/>
+		<Key android:codes="56" android:keyLabel="."/>
+		<Key android:codes="76" android:keyLabel="/"/>
+		<Key android:codes="0" android:keyLabel="SHFT" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row android:rowEdgeFlags="bottom">
-		<Key android:codes="44" android:keyLabel="," android:keyWidth="10%p" android:keyEdgeFlags="left"/>
-		<Key android:codes="47" android:keyLabel="/" android:keyWidth="10%p"/>
-		<Key android:codes="32" android:keyLabel="C64" android:keyWidth="40%p" android:isRepeatable="true"/>
-		<Key android:codes="-5" android:keyLabel="DEL" android:keyWidth="20%p" android:isRepeatable="true"/>
-		<Key android:codes="-4" android:keyLabel="DONE" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+		<Key android:codes="124" android:keyLabel="GBP" android:keyWidth="10%p" android:keyEdgeFlags="left"/>
+		<Key android:codes="68" android:keyLabel="-" android:keyWidth="10%p"/>
+		<Key android:codes="112" android:keyLabel="|" android:keyWidth="10%p"/>
+		<Key android:codes="62" android:keyLabel="SPACE" android:keyWidth="40%p"/>
+		<Key android:codes="73" android:keyLabel="=" android:keyWidth="10%p"/>
+		<Key android:codes="23" android:keyLabel="RETURN" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
 	</Row>
 </Keyboard>

From c530a220f9cb19c7af0477cd0a17d3a576bf648e Mon Sep 17 00:00:00 2001
From: lubomyr <lubomyr31@gmail.com>
Date: Thu, 30 Jul 2015 20:33:27 +0000
Subject: [PATCH 2/4] amiga keyboard layout updated

---
 project/res/xml/amiga.xml | 117 +++++++++++++++++++++++---------------
 1 file changed, 72 insertions(+), 45 deletions(-)

diff --git a/project/res/xml/amiga.xml b/project/res/xml/amiga.xml
index 8dfdeeb0d..20c77879a 100644
--- a/project/res/xml/amiga.xml
+++ b/project/res/xml/amiga.xml
@@ -6,58 +6,85 @@
 	android:verticalGap="0px"
 	android:keyHeight="10%p">
 	<Row>
-		<Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left"/>
-		<Key android:codes="50" android:keyLabel="2"/>
-		<Key android:codes="51" android:keyLabel="3"/>
-		<Key android:codes="52" android:keyLabel="4"/>
-		<Key android:codes="53" android:keyLabel="5"/>
-		<Key android:codes="54" android:keyLabel="6"/>
-		<Key android:codes="55" android:keyLabel="7"/>
-		<Key android:codes="56" android:keyLabel="8"/>
-		<Key android:codes="57" android:keyLabel="9"/>
-		<Key android:codes="48" android:keyLabel="0" android:keyEdgeFlags="right"/>
+		<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="69" android:keyLabel="-" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
-		<Key android:codes="119" android:keyLabel="w"/>
-		<Key android:codes="101" android:keyLabel="e"/>
-		<Key android:codes="114" android:keyLabel="r"/>
-		<Key android:codes="116" android:keyLabel="t"/>
-		<Key android:codes="121" android:keyLabel="y"/>
-		<Key android:codes="117" android:keyLabel="u"/>
-		<Key android:codes="105" android:keyLabel="i"/>
-		<Key android:codes="111" android:keyLabel="o"/>
-		<Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+		<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="70" android:keyLabel="=" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="97" android:keyLabel="a" android:keyEdgeFlags="left"/>
-		<Key android:codes="115" android:keyLabel="s"/>
-		<Key android:codes="100" android:keyLabel="d"/>
-		<Key android:codes="102" android:keyLabel="f"/>
-		<Key android:codes="103" android:keyLabel="g"/>
-		<Key android:codes="104" android:keyLabel="h"/>
-		<Key android:codes="106" android:keyLabel="j"/>
-		<Key android:codes="107" android:keyLabel="k"/>
-		<Key android:codes="108" android:keyLabel="l"/>
-		<Key android:codes="35,64" android:keyLabel="\# \@" android:keyEdgeFlags="right"/>
+		<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="-1" android:keyLabel="CAPS" android:keyEdgeFlags="left"/>
-		<Key android:codes="122" android:keyLabel="z"/>
-		<Key android:codes="120" android:keyLabel="x"/>
-		<Key android:codes="99" android:keyLabel="c"/>
-		<Key android:codes="118" android:keyLabel="v"/>
-		<Key android:codes="98" android:keyLabel="b"/>
-		<Key android:codes="110" android:keyLabel="n"/>
-		<Key android:codes="109" android:keyLabel="m"/>
-		<Key android:codes="46" android:keyLabel="."/>
-		<Key android:codes="63,33,58" android:keyLabel="\? ! :" android:keyEdgeFlags="right"/>
+		<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="44" android:keyLabel="," android:keyWidth="10%p" android:keyEdgeFlags="left"/>
-		<Key android:codes="47" android:keyLabel="/" android:keyWidth="10%p"/>
-		<Key android:codes="32" android:keyLabel="AMIGA" android:keyWidth="40%p" android:isRepeatable="true"/>
-		<Key android:codes="-5" android:keyLabel="DEL" android:keyWidth="20%p" android:isRepeatable="true"/>
-		<Key android:codes="-4" android:keyLabel="DONE" android:keyWidth="20%p" android:keyEdgeFlags="right"/>
+		<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="18" android:keyLabel="#"/>
+		<Key android:codes="62" android:keyLabel="SPACE" android:keyWidth="30%p" />
+		<Key android:codes="71" android:keyLabel="["/>
+		<Key android:codes="72" android:keyLabel="]"/>
+		<Key android:codes="58" android:keyLabel="ALT"/>
+		<Key android:codes="67" android:keyLabel="DEL" android:keyEdgeFlags="right"/>
 	</Row>
 </Keyboard>

From 4d02f3d3c5f2a61d165ce8ce5c8da3f4ffdc6189 Mon Sep 17 00:00:00 2001
From: lubomyr <lubomyr31@gmail.com>
Date: Thu, 30 Jul 2015 21:30:45 +0000
Subject: [PATCH 3/4] amiga keyboard layout updated

---
 project/res/xml/amiga.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/res/xml/amiga.xml b/project/res/xml/amiga.xml
index 20c77879a..f6f1fd2d4 100644
--- a/project/res/xml/amiga.xml
+++ b/project/res/xml/amiga.xml
@@ -32,7 +32,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="69" android:keyLabel="-" android:keyEdgeFlags="right"/>
+		<Key android:codes="67" android:keyLabel="DEL" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
 		<Key android:codes="61" android:keyLabel="TAB" android:keyEdgeFlags="left"/>
@@ -46,7 +46,7 @@
 		<Key android:codes="37" android:keyLabel="i"/>
 		<Key android:codes="43" android:keyLabel="o"/>
 		<Key android:codes="44" android:keyLabel="p"/>
-		<Key android:codes="70" android:keyLabel="=" android:keyEdgeFlags="right"/>
+		<Key android:codes="66" android:keyLabel="RET" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
 		<Key android:codes="113" android:keyLabel="CTRL" android:keyEdgeFlags="left"/>
@@ -80,11 +80,11 @@
 		<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="18" 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"/>
-		<Key android:codes="67" android:keyLabel="DEL" android:keyEdgeFlags="right"/>
+		<Key android:codes="58" android:keyLabel="ALT" android:keyEdgeFlags="right"/>
 	</Row>
 </Keyboard>

From 4d68d531b1618da70d2243ce6d61860555daa053 Mon Sep 17 00:00:00 2001
From: lubomyr <lubomyr31@gmail.com>
Date: Fri, 31 Jul 2015 11:18:52 +0000
Subject: [PATCH 4/4] c64 keyboard layout updated

---
 project/res/xml/c64.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/project/res/xml/c64.xml b/project/res/xml/c64.xml
index 8be215e4a..e4692f563 100644
--- a/project/res/xml/c64.xml
+++ b/project/res/xml/c64.xml
@@ -5,12 +5,11 @@
 	android:horizontalGap="0px"
 	android:verticalGap="0px"
 	android:keyHeight="10%p">
-	
 	<Row>
-		<Key android:codes="0" android:keyLabel="C=" android:keyEdgeFlags="left"/>
+		<Key android:codes="113" android:keyLabel="C=" android:keyEdgeFlags="left"/>
 		<Key android:codes="111" android:keyLabel="RS" />
-		<Key android:codes="0" android:keyLabel="CTRL" />
-		<Key android:codes="102" android:keyLabel="F1" />
+		<Key android:codes="5" android:keyLabel="CTRL" />
+		<Key android:codes="126" android:keyLabel="F1" />
 		<Key android:codes="103" android:keyLabel="F3" />
 		<Key android:codes="104" android:keyLabel="F5" />
 		<Key android:codes="105" android:keyLabel="F7" />
@@ -45,10 +44,10 @@
 		<Key android:codes="43" android:keyLabel="o"/>
 		<Key android:codes="44" android:keyLabel="p"/>
 		<Key android:codes="72" android:keyLabel="*"/>
-		<Key android:codes="0" android:keyLabel="RST" android:keyEdgeFlags="right"/>
+		<Key android:codes="92" android:keyLabel="RST" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="0" android:keyLabel="SL" android:keyEdgeFlags="left"/>
+		<Key android:codes="115" android:keyLabel="SL" android:keyEdgeFlags="left"/>
 		<Key android:codes="29" android:keyLabel="a"/>
 		<Key android:codes="47" android:keyLabel="s"/>
 		<Key android:codes="32" android:keyLabel="d"/>
@@ -62,7 +61,7 @@
 		<Key android:codes="75" android:keyLabel=";" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row>
-		<Key android:codes="0" android:keyLabel="SHFT" android:keyEdgeFlags="left"/>
+		<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"/>
@@ -70,10 +69,10 @@
 		<Key android:codes="30" android:keyLabel="b"/>
 		<Key android:codes="42" android:keyLabel="n"/>
 		<Key android:codes="41" android:keyLabel="m"/>
-		<Key android:codes="56" android:keyLabel=","/>
+		<Key android:codes="55" android:keyLabel=","/>
 		<Key android:codes="56" android:keyLabel="."/>
 		<Key android:codes="76" android:keyLabel="/"/>
-		<Key android:codes="0" android:keyLabel="SHFT" android:keyEdgeFlags="right"/>
+		<Key android:codes="60" android:keyLabel="SHFT" android:keyEdgeFlags="right"/>
 	</Row>
 	<Row android:rowEdgeFlags="bottom">
 		<Key android:codes="124" android:keyLabel="GBP" android:keyWidth="10%p" android:keyEdgeFlags="left"/>