From 282801214641aa2f20373fca58992170fc9feb75 Mon Sep 17 00:00:00 2001
From: Rigel Trajano <rigel@gooee.com>
Date: Thu, 10 Aug 2017 00:36:16 -0400
Subject: [PATCH] add colemak keyboard layout

---
 README.md                                     |   4 +-
 .../values-en-rCO/donottranslate-altchars.xml |  47 ++
 .../values-en-rCO/donottranslate-keymap.xml   | 222 ++++++++
 java/res/xml-en-rCO/kbd_qwerty.xml            | 523 ++++++++++++++++++
 .../pckeyboard/InputLanguageSelection.java    |   8 +-
 5 files changed, 799 insertions(+), 5 deletions(-)
 create mode 100644 java/res/values-en-rCO/donottranslate-altchars.xml
 create mode 100644 java/res/values-en-rCO/donottranslate-keymap.xml
 create mode 100644 java/res/xml-en-rCO/kbd_qwerty.xml

diff --git a/README.md b/README.md
index ae2b46d48..1e48a76ab 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ This keyboard is especially useful if you use ConnectBot for SSH access. It prov
 The supported keyboard layouts include Armenian (Հայերեն), Arabic (العربية),
 British (en\_GB), Bulgarian (български език), Czech (Čeština), Danish (dansk),
 Carpalx English (language "en-CX"), Dvorak English (language "en-DV"), English
-(QWERTY), Finnish (Suomi), French (Français, AZERTY), German (Deutsch, QWERTZ),
-German Neo2 (Deutsch, language "de-NE"),
+(QWERTY), Colemak English (language "en-CO"), Finnish (Suomi), French
+(Français, AZERTY), German (Deutsch, QWERTZ), German Neo2 (Deutsch, language "de-NE"),
 Greek (ελληνικά), Hebrew (עברית), Hungarian (Magyar), Italian (Italiano), Lao
 (ພາສາລາວ), Norwegian (Norsk bokmål), Persian (فارسی), Portuguese (Português),
 Romanian (Română), Russian (Русский), Russian phonetic (Русский, ru-rPH),
diff --git a/java/res/values-en-rCO/donottranslate-altchars.xml b/java/res/values-en-rCO/donottranslate-altchars.xml
new file mode 100644
index 000000000..f6baa5c18
--- /dev/null
+++ b/java/res/values-en-rCO/donottranslate-altchars.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">áàâãäåāæ</string>
+    <string name="alternates_for_b"></string>
+    <string name="alternates_for_c">8çčć¢</string>
+    <string name="alternates_for_d">đ</string>
+    <string name="alternates_for_e">éèêëē€</string>
+    <string name="alternates_for_f">6₣</string>
+    <string name="alternates_for_g">7</string>
+    <string name="alternates_for_h"></string>
+    <string name="alternates_for_i">íìîïī</string>
+    <string name="alternates_for_j"></string>
+    <string name="alternates_for_k"></string>
+    <string name="alternates_for_l">0£₤λ</string>
+    <string name="alternates_for_m">μ</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_o">óòôõöōø</string>
+    <string name="alternates_for_p">4π₱</string>
+    <string name="alternates_for_q"></string>
+    <string name="alternates_for_r">9</string>
+    <string name="alternates_for_s">§ßš</string>
+    <string name="alternates_for_t"></string>
+    <string name="alternates_for_u">úùûüū</string>
+    <string name="alternates_for_v"></string>
+    <string name="alternates_for_w"></string>
+    <string name="alternates_for_x"></string>
+    <string name="alternates_for_y">5ýÿ¥</string>
+    <string name="alternates_for_z">ž</string>
+</resources>
diff --git a/java/res/values-en-rCO/donottranslate-keymap.xml b/java/res/values-en-rCO/donottranslate-keymap.xml
new file mode 100644
index 000000000..5e4c357a0
--- /dev/null
+++ b/java/res/values-en-rCO/donottranslate-keymap.xml
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+**
+**
+** 5-row layout for English Colemak.
+**
+** See http://code.google.com/p/hackerskeyboard/wiki/AddingNewLayouts for
+** more information.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="key_tlde_main">`</string>
+    <string name="key_tlde_shift">~</string>
+    <string name="key_tlde_alt"></string>
+    
+    <string name="key_ae01_main">1</string>
+    <string name="key_ae01_shift">!</string>
+    <string name="key_ae01_alt">¡¹½⅓¼⅛</string>
+
+    <string name="key_ae02_main">2</string>
+    <string name="key_ae02_shift">\@</string>
+    <string name="key_ae02_alt">²⅔</string>
+    
+    <string name="key_ae03_main">3</string>
+    <string name="key_ae03_shift">#</string>
+    <string name="key_ae03_alt">³¾⅜♥♠♦♣</string>
+    
+    <string name="key_ae04_main">4</string>
+    <string name="key_ae04_shift">$</string>
+    <string name="key_ae04_alt">⁴¢£€¥</string>
+    
+    <string name="key_ae05_main">5</string>
+    <string name="key_ae05_shift">%</string>
+    <string name="key_ae05_alt">⅝‰</string>
+    
+    <string name="key_ae06_main">6</string>
+    <string name="key_ae06_shift">^</string>
+    <string name="key_ae06_alt">↑↓←→</string>
+    
+    <string name="key_ae07_main">7</string>
+    <string name="key_ae07_shift">&amp;</string>
+    <string name="key_ae07_alt">⅞♪</string>
+    
+    <string name="key_ae08_main">8</string>
+    <string name="key_ae08_shift">*</string>
+    <string name="key_ae08_alt">•★∞†‡</string>
+    
+    <string name="key_ae09_main">9</string>
+    <string name="key_ae09_shift">(</string>
+    <string name="key_ae09_alt">√</string>
+    
+    <string name="key_ae10_main">0</string>
+    <string name="key_ae10_shift">)</string>
+    <string name="key_ae10_alt">ⁿ°</string>
+    
+    <string name="key_ae11_main">-</string>
+    <string name="key_ae11_shift">_</string>
+    <string name="key_ae11_alt">—–</string>
+    
+    <string name="key_ae12_main">=</string>
+    <string name="key_ae12_shift">+</string>
+    <string name="key_ae12_alt">≈≠±×÷</string>
+
+
+    <string name="key_ad01_main">q</string>
+    <string name="key_ad01_shift">Q</string>
+    <string name="key_ad01_alt">@string/alternates_for_q</string>
+    
+    <string name="key_ad02_main">w</string>
+    <string name="key_ad02_shift">W</string>
+    <string name="key_ad02_alt">@string/alternates_for_w</string>
+    
+    <string name="key_ad03_main">f</string>
+    <string name="key_ad03_shift">F</string>
+    <string name="key_ad03_alt">@string/alternates_for_f</string>
+
+    <string name="key_ad04_main">p</string>
+    <string name="key_ad04_shift">P</string>
+    <string name="key_ad04_alt">@string/alternates_for_p</string>
+    
+    <string name="key_ad05_main">g</string>
+    <string name="key_ad05_shift">G</string>
+    <string name="key_ad05_alt">@string/alternates_for_g</string>
+    
+    <string name="key_ad06_main">j</string>
+    <string name="key_ad06_shift">J</string>
+    <string name="key_ad06_alt">@string/alternates_for_j</string>
+
+    <string name="key_ad07_main">l</string>
+    <string name="key_ad07_shift">L</string>
+    <string name="key_ad07_alt">@string/alternates_for_l</string>
+    
+    <string name="key_ad08_main">u</string>
+    <string name="key_ad08_shift">U</string>
+    <string name="key_ad08_alt">@string/alternates_for_u</string>
+    
+    <string name="key_ad09_main">y</string>
+    <string name="key_ad09_shift">Y</string>
+    <string name="key_ad09_alt">@string/alternates_for_y</string>
+    
+    <string name="key_ad10_main">;</string>
+    <string name="key_ad10_shift">:</string>
+    <string name="key_ad10_alt"></string>
+
+    <string name="key_ad11_main">[</string>
+    <string name="key_ad11_shift">{</string>
+    <string name="key_ad11_alt"></string>
+    
+    <string name="key_ad12_main">]</string>
+    <string name="key_ad12_shift">}</string>
+    <string name="key_ad12_alt"></string>
+
+    <string name="key_bksl_main">\\</string>
+    <string name="key_bksl_shift">|</string>
+    <string name="key_bksl_alt"></string>
+    
+    
+    <string name="key_ac01_main">a</string>
+    <string name="key_ac01_shift">A</string>
+    <string name="key_ac01_alt">@string/alternates_for_a</string>
+
+    <string name="key_ac02_main">r</string>
+    <string name="key_ac02_shift">R</string>
+    <string name="key_ac02_alt">@string/alternates_for_r</string>
+
+    <string name="key_ac03_main">s</string>
+    <string name="key_ac03_shift">S</string>
+    <string name="key_ac03_alt">@string/alternates_for_s</string>
+
+    <string name="key_ac04_main">t</string>
+    <string name="key_ac04_shift">T</string>
+    <string name="key_ac04_alt">@string/alternates_for_t</string>
+
+    <string name="key_ac05_main">d</string>
+    <string name="key_ac05_shift">D</string>
+    <string name="key_ac05_alt">@string/alternates_for_d</string>
+
+    <string name="key_ac06_main">h</string>
+    <string name="key_ac06_shift">H</string>
+    <string name="key_ac06_alt">@string/alternates_for_h</string>
+
+    <string name="key_ac07_main">n</string>
+    <string name="key_ac07_shift">N</string>
+    <string name="key_ac07_alt">@string/alternates_for_n</string>
+
+    <string name="key_ac08_main">e</string>
+    <string name="key_ac08_shift">E</string>
+    <string name="key_ac08_alt">@string/alternates_for_e</string>
+
+    <string name="key_ac09_main">i</string>
+    <string name="key_ac09_shift">I</string>
+    <string name="key_ac09_alt">@string/alternates_for_i</string>
+
+    <string name="key_ac10_main">o</string>
+    <string name="key_ac10_shift">o</string>
+    <string name="key_ac10_alt">@string/alternates_for_o</string>
+
+
+    <string name="key_ac11_main">\'</string>
+    <string name="key_ac11_shift">\"</string>
+    <string name="key_ac11_alt">‘’“”</string>
+
+
+    <string name="key_lsgt_main"></string>
+    <string name="key_lsgt_shift"></string>
+    <string name="key_lsgt_alt"></string>
+
+    <string name="key_ab01_main">z</string>
+    <string name="key_ab01_shift">Z</string>
+    <string name="key_ab01_alt">@string/alternates_for_z</string>
+
+    <string name="key_ab02_main">x</string>
+    <string name="key_ab02_shift">X</string>
+    <string name="key_ab02_alt">@string/alternates_for_x</string>
+
+    <string name="key_ab03_main">c</string>
+    <string name="key_ab03_shift">C</string>
+    <string name="key_ab03_alt">@string/alternates_for_c</string>
+
+    <string name="key_ab04_main">v</string>
+    <string name="key_ab04_shift">V</string>
+    <string name="key_ab04_alt">@string/alternates_for_v</string>
+
+    <string name="key_ab05_main">b</string>
+    <string name="key_ab05_shift">B</string>
+    <string name="key_ab05_alt">@string/alternates_for_b</string>
+
+    <string name="key_ab06_main">k</string>
+    <string name="key_ab06_shift">K</string>
+    <string name="key_ab06_alt">@string/alternates_for_k</string>
+
+    <string name="key_ab07_main">m</string>
+    <string name="key_ab07_shift">M</string>
+    <string name="key_ab07_alt">@string/alternates_for_m</string>
+
+    <string name="key_ab08_main">,</string>
+    <string name="key_ab08_shift">&lt;</string>
+    <string name="key_ab08_alt">≤«‹</string>
+
+    <string name="key_ab09_main">.</string>
+    <string name="key_ab09_shift">&gt;</string>
+    <string name="key_ab09_alt">≥»›…</string>
+
+    <string name="key_ab10_main">/</string>
+    <string name="key_ab10_shift">\?</string>
+    <string name="key_ab10_alt">¿</string>
+</resources>
diff --git a/java/res/xml-en-rCO/kbd_qwerty.xml b/java/res/xml-en-rCO/kbd_qwerty.xml
new file mode 100644
index 000000000..369d1ab2c
--- /dev/null
+++ b/java/res/xml-en-rCO/kbd_qwerty.xml
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+    xmlns:android="http://schemas.android.com/apk/res/org.pocketworkstation.pckeyboard"
+    android:keyWidth="10%p"
+    android:horizontalGap="0px"
+    android:verticalGap="@dimen/key_bottom_gap"
+>
+    <Row android:extension="true">
+        <Key android:keyLabel="1" android:shiftLabel="!" />
+        <Key android:keyLabel="2" android:shiftLabel="\@" />
+        <Key android:keyLabel="3" android:shiftLabel="\#" />
+        <Key android:keyLabel="4" android:shiftLabel="&amp;" />
+        <Key android:keyLabel="5" android:shiftLabel="-" />
+        <Key android:keyLabel="6" android:shiftLabel="\'" />
+        <Key android:keyLabel="7" android:shiftLabel=":" />
+        <Key android:keyLabel="8" android:shiftLabel="&quot;" />
+        <Key android:keyLabel="9" android:shiftLabel="/" />
+        <Key android:keyLabel="0" android:shiftLabel="\?" />
+    </Row>    
+    <Row>
+        <Key
+            android:keyLabel="q"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_q"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="w"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_w" />
+        <Key
+            android:keyLabel="f"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_f" />
+        <Key
+            android:keyLabel="p"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_p" />
+        <Key
+            android:keyLabel="g"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_g" />
+        <Key
+            android:keyLabel="j"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_j" />
+        <Key
+            android:keyLabel="l"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_l" />
+        <Key
+            android:keyLabel="u"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_u" />
+        <Key
+            android:keyLabel="y"
+            android:popupKeyboard="@xml/kbd_popup_narrow_template"
+            android:popupCharacters="@string/alternates_for_y" />
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row>
+        <Key
+            android:keyLabel="a"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_a"
+            android:horizontalGap="5%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="r"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_s" />
+        <Key
+            android:keyLabel="s"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_d" />
+        <Key
+            android:keyLabel="t"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_f" />
+        <Key
+            android:keyLabel="d"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_g" />
+        <Key
+            android:keyLabel="h"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_h" />
+        <Key
+            android:keyLabel="n"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_j" />
+        <Key
+            android:keyLabel="e"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_k" />
+        <Key
+            android:keyLabel="i"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_l"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row>
+        <Key
+            android:codes="@integer/key_shift"
+            android:keyIcon="@drawable/sym_keyboard_shift"
+            android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="z"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_z" />
+        <Key
+            android:keyLabel="x"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_x" />
+        <Key
+            android:keyLabel="c"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_c" />
+        <Key
+            android:keyLabel="v"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_v" />
+        <Key
+            android:keyLabel="b"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_b" />
+        <Key
+            android:keyLabel="k"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_n" />
+        <Key
+            android:keyLabel="m"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="@string/alternates_for_m" />
+        <Key
+            android:codes="@integer/key_delete"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_normal"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_url"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_email"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_im"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel=":-)"
+            android:keyOutputText=":-) "
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_smileys"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_webentry"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_tab"
+            android:keyIcon="@drawable/sym_keyboard_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_normal_with_settings_key"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_url_with_settings_key"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_email_with_settings_key"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_im_with_settings_key"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel=":-)"
+            android:keyOutputText=":-) "
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_smileys"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_webentry_with_settings_key"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_tab"
+            android:keyIcon="@drawable/sym_keyboard_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+</Keyboard>
diff --git a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
index dfa361090..332e454e6 100644
--- a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
+++ b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
@@ -69,7 +69,7 @@ public class InputLanguageSelection extends PreferenceActivity {
     // the available keyboard resources and dictionaries.
     private static final String[] KBD_LOCALIZATIONS = {
         "ar", "bg", "bg_ST", "ca", "cs", "cs_QY", "da", "de", "de_NE",
-        "el", "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "es_US",
+        "el", "en", "en_CO", "en_CX", "en_DV", "en_GB", "es", "es_LA", "es_US",
         "fa", "fi", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "in",
         "it", "iw", "ja", "ka", "ko", "lo", "lt", "lv", "nb", "nl", "pl",
         "pt", "pt_PT", "rm", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl",
@@ -78,7 +78,7 @@ public class InputLanguageSelection extends PreferenceActivity {
 
     private static final String[] KBD_5_ROW = {
         "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el",
-        "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "fa", "fi", "fr",
+        "en", "en_CO", "en_CX", "en_DV", "en_GB", "es", "es_LA", "fa", "fi", "fr",
         "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "it", "iw", "lo", "lt",
         "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl",
         "sr", "sv", "ta", "th", "tr", "uk"
@@ -86,7 +86,7 @@ public class InputLanguageSelection extends PreferenceActivity {
 
     private static final String[] KBD_4_ROW = {
         "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el",
-        "en", "en_CX", "en_DV", "es", "es_LA", "es_US", "fa", "fr", "fr_CA",
+        "en", "en_CO", "en_CX", "en_DV", "es", "es_LA", "es_US", "fa", "fr", "fr_CA",
         "he", "hr", "hu", "hu_QY", "iw", "nb", "ru", "ru_PH", "sk", "sk_QY",
         "sl", "sr", "sv", "tr", "uk"
     };
@@ -98,6 +98,8 @@ private static String getLocaleName(Locale l) {
             return "English (Dvorak)";
         } else if (lang.equals("en") && country.equals("EX")) {
                 return "English (4x11)";
+        } else if (lang.equals("en") && country.equals("CO")) {
+            return "English (Colemak)";
         } else if (lang.equals("en") && country.equals("CX")) {
                 return "English (Carpalx)";
         } else if (lang.equals("es") && country.equals("LA")) {