Release 1.17.0

* Added Czech translation and layout

Translated keyboard and created Czech multilingual "practical" layout for faster typing and typing in commonly used languages (German, Slovak + French w/accents)

* Update (Rephrase) full_description.txt

... to better suit the language and naturally promote keyboard's features and possibilities to a wider audience.

.github/workflows/make-apk.yml

@@ -9,26 +9,32 @@ jobs:
   Build-Apk:
     runs-on: ubuntu-latest
     steps:
-    - name: Install nix
-      uses: cachix/install-nix-action@v15
+    - uses: actions/setup-java@v2
       with:
-        nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v10
-      with:
-        name: julow
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-    - name: Checkout Repo
+        distribution: 'zulu' # See 'Supported distributions' for available options
+        java-version: '11'
+    - name: Checkout repo
       uses: actions/checkout@v2
     - name: Cache debug certificate
       uses: actions/cache@v2
       with:
         path: _build/debug.keystore
         key: debug-keystore
-    - name: Run nix-shell and Make
-      uses: ZenithalHourlyRate/nix-shell-action@v4
-      with:
-        file: shell.nix
-        script: make
+    - name: Restore debug keystore from github Secrets 
+      run: |
+        mkdir -p _build
+        cd "_build"
+        # Check if exist and use the secret named DEBUG_KEYSTORE
+        # The contents of the secret can be obtained -
+        #    from the debug.keystore.asc from you local _build folder
+        if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
+            echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
+            if [[ -s "debug.keystore.asc" ]]; then
+                gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
+            fi
+        fi
+    - name: Build
+      run: make
     - name: Save debug apk
       uses: actions/upload-artifact@v2
       with:

.gitignore

@@ -1,3 +1,4 @@
 *.keystore
+*.keystore.asc
 _build
 /*-keystore.conf

AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="18" android:versionName="1.13.1" android:hardwareAccelerated="false">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="25" android:versionName="1.17.0" android:hardwareAccelerated="false">
   <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="30"/>
   <application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:hardwareAccelerated="false">
     <service android:name="juloo.keyboard2.Keyboard2" android:label="@string/app_name" android:permission="android.permission.BIND_INPUT_METHOD">

CONTRIBUTING.md

@@ -12,7 +12,8 @@ Fortunately, there's not many dependencies:
 - Android SDK: build tools (minimum `28.0.1`), platform `30`
 - Make sure to have the `$ANDROID_HOME` environment variable set.
 
-For Nix users, there's a `shell.nix` for setting-up the right environment.
+For Nix users, the right environment can be obtained with `nix-shell ./shell.nix`.
+Instructions to install Nix are [here](https://nixos.wiki/wiki/Nix_Installation_Guide).
 
 Building the debug apk:
 
@@ -20,8 +21,25 @@ Building the debug apk:
 make
 ```
 
-If the build succeed, the debug apk is located in
-`_build/juloo.keyboard2.debug.apk`.
+If the build succeed, the debug apk is located in `_build/juloo.keyboard2.debug.apk`.
+
+## Using the local debug.keystore on the Github CI actions
+
+It's possible to save the local debug.keystore into a github secret, so the same keystore is utilized to build the debug apk in the CI github actions.
+Doing this, they wil have the same signature, thus the debug apk can be updated without having to uninstall it first.
+
+After you sucessfully run `make`, (thus a debug.keystore exists) you can use this second command to generate a base64 stringified version of it
+
+```sh
+cd _build
+gpg -c --armor --pinentry-mode loopback --passphrase debug0 --yes "debug.keystore"
+```
+
+A file will be generated inside the local `_build/` folder, called `debug.keystore.asc`
+
+You can copy the content of this file, and with that, paste it into a new github secret in your repo settings. 
+
+The secret must be named `DEBUG_KEYSTORE`
 
 ## Debugging on your phone
 
@@ -60,26 +78,54 @@ make installd
 
 ## Guidelines
 
-### Add a localized layout
+### Adding a programming layout
 
-Localized layouts (a layout specific to a language) are generally accepted.
+A programming layout must contains every ASCII characters.
+The current programming layouts are: QWERTY, Dvorak.
+
+Layouts are defined in XML, see `res/xml/qwerty.xml`. An entry must be added to
+the layout option in `res/values/arrays.xml`, to both `pref_layout_values`
+(correspond to the file name) and `pref_layout_entries` (display name).
+The layout must also be referenced in `srcs/juloo.keyboard2/Config.java` in
+`layoutId_of_string`.
+
+Keys with a name starting in `loc ` are hidden unless they are configured for
+the user's installed languages in `res/xml/method.xml`. These keys are optional
+and will be added automatically when necessary.
+
+Some users cannot easily type the characters close the the edges of the screen
+due to a bulky phone case. It is best to avoid placing important characters
+there (such as the digits or punctuation).
+
+### Adding a localized layout
+
+Localized layouts (a layout specific to a language) are gladly accepted.
 See for example: 4333575 (Bulgarian), 88e2175 (Latvian), 133b6ec (German).
 
-This keyboard is intended for programmers. If your language uses the Latin script, make sure it is possible to type every letters on the QWERTY keyboard.
-This is generally done using dead-keys, for example: 0bf7ff5 (Latvian), 573c13f (Swedish).
-It is also possible to add some characters that are hidden in other languages, for example 93e84ba (ß), though the space is limited.
+They don't need to contain every ASCII characters (although it's useful in
+passwords) and dead-keys.
 
-### Add a programming layout
+### Adding support for a language
 
-A programming layout must contains every ASCII characters as well as every dead-keys.
-Currently, the only example is QWERTY.
+Supported locales are defined in `res/xml/method.xml`.
+
+The attributes `languageTag` and `imeSubtypeLocale` define a locale, the
+attribute `imeSubtypeExtraValue` defines the default layout and the dead-keys
+and other extra keys to show. 
 
 ### Translations
 
-Translations are always welcome ! See for example: 1723288 (Latvian), baf867a (French).
-The app can be translated by writing `res/values-<language code>/strings.xml` (for example `values-fr`, `values-lv`), based on the default: `res/values/strings.xml` (English).
+Translations are always welcome !
 
-The store description is found in `metadata/android/<locale>/`, `short_description.txt` and `full_description.txt`.
-The full description changes very infrequently (it was changed once in 6 years). But if it changes too much, outdated translation might be removed.
+See for example: 1723288 (Latvian), baf867a (French).
+The app can be translated by writing `res/values-<language code>/strings.xml`
+(for example `values-fr`, `values-lv`), based on the default:
+`res/values/strings.xml` (English).
 
-Translating changelogs is not useful because they evolve too fast. Changelogs are generally written entirely just before a release, translating them would delay releases too much. Old changelogs are not shown to anyone currently.
+The store description is found in `metadata/android/<locale>/`,
+`short_description.txt` and `full_description.txt`.
+Translating changelogs is not useful. Changelogs are written quickly just
+before a release and older ones are never shown to anyone currently.
+
+The app name might be partially translated, the "unexpected" word should remain
+untranslated.

Makefile

@@ -6,7 +6,6 @@ ANDROID_PLATFORM_VERSION = android-30
 JAVA_VERSION = 1.7
 
 SRC_DIR = srcs
-ASSETS_DIR = assets
 RES_DIR = res
 
 EXTRA_JARS =
@@ -17,9 +16,16 @@ debug: _build/$(PACKAGE_NAME).debug.apk
 release: _build/$(PACKAGE_NAME).apk
 
 installd: _build/$(PACKAGE_NAME).debug.apk
-	adb install "$<"
+	adb install -r "$<"
 
-.PHONY: release debug installd
+clean:
+	rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \
+		_build/*.idsig _build/assets
+
+rebuild_special_font:
+	cd srcs/special_font && fontforge -lang=ff -script build.pe *.svg
+
+.PHONY: release debug installd clean rebuild_special_font
 
 $(shell mkdir -p _build)
 
@@ -42,7 +48,6 @@ JAVAC_FLAGS = -source $(JAVA_VERSION) -target $(JAVA_VERSION) -encoding utf8
 MANIFEST_FILE = AndroidManifest.xml
 JAVA_FILES = $(shell find $(SRC_DIR) -name '*.java')
 RES_FILES = $(shell find $(RES_DIR) -type f)
-ASSETS_FILES = $(shell find $(ASSETS_DIR) -type f 2>/dev/null)
 
 # Debug signing
 
@@ -60,7 +65,7 @@ _build/%.debug.apk: _build/%.debug.unsigned-apk $(DEBUG_KEYSTORE)
 
 # Debug apk
 
-_build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest-package $(PACKAGE_NAME).debug
+_build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest-package $(PACKAGE_NAME).debug --product debug
 
 # Release signing
 
@@ -76,11 +81,17 @@ _build/%.apk: _build/%.unsigned-apk %-keystore.conf
 _build/%.unsigned-apk: _build/%.unaligned-apk
 	$(ANDROID_BUILD_TOOLS)/zipalign -fp 4 "$<" "$@"
 
-_build/%.unaligned-apk: _build/classes.dex $(MANIFEST_FILE) $(ASSETS_FILES)
+APK_EXTRA_FILES = classes.dex assets/special_font.ttf
+
+_build/%.unaligned-apk: $(addprefix _build/,$(APK_EXTRA_FILES)) $(MANIFEST_FILE)
 	$(ANDROID_BUILD_TOOLS)/aapt package -f -M $(MANIFEST_FILE) -S $(RES_DIR) \
 		-I $(ANDROID_PLATFORM)/android.jar -F "$@" $(AAPT_PACKAGE_FLAGS)
-	[ -z "$(ASSETS_FILES)" ] || $(ANDROID_BUILD_TOOLS)/aapt add "$@" $(ASSETS_FILES)
-	cd $(@D) && $(ANDROID_BUILD_TOOLS)/aapt add $(@F) classes.dex
+	cd $(@D) && $(ANDROID_BUILD_TOOLS)/aapt add $(@F) $(APK_EXTRA_FILES)
+
+# Copy the special font file into _build because aapt requires relative paths
+_build/assets/special_font.ttf: srcs/special_font/result.ttf
+	mkdir -p $(@D)
+	cp "$<" "$@"
 
 # R.java
 

README.md

@@ -1,8 +1,9 @@
 # Unexpected Keyboard
 
 A lightweight virtual keyboard for developers.
-
-![Unexpected Keyboard](metadata/android/en-US/images/featureGraphic.png)
+| <img src="/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
+| --- | --- | --- |
+| <img src="/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
 
 This app is a virtual keyboard for Android. The main features are easy typing of every ASCII character using the swipe gesture, dead keys for accents and modifier keys and the presence of special keys (tab, esc, arrows, etc..).
 

assets/fonts/README.md

@@ -1,15 +0,0 @@
-# Fonts
-
-The glyphs from this font are made by:
-
-- Home and End
-  Author: @sdrapha
-
-- Cog
-  Copyright (C) 2016 by Dave Gandy
-  Author:    Dave Gandy
-  License:   SIL ()
-
-- Emoticon, PageUp and PageDown
-  IcoMoon-Free is a free vector icon pack by Keyamoon.
-  License: Attribution 4.0 International (CC BY 4.0) 

metadata/android/cs-CZ/full_description.txt

@@ -0,0 +1,18 @@
+Tato aplikace je virtuální klávesnící pro Android. Umožňuje rychlejší a plynulejší psaní písmen i symbolů (vč. diakritiky), a to ve vícero jazycích a vlastních rozloženích. To vše zdarma, bez reklam a bez plýtvání vašeho uložiště. Můžete psát libovolné znaky pomocí gest (ASCII i Unicode), používat mrtvé (univerzální) klávesy pro diakritická znaménka a mnohem více.
+
+Klávesnice zobrazuje až 4 další znaky v rozích každé klávesy. Tyto znaky jsou vyvolány přejetím prstu do vybraného rohu.
+
+No zkrátka...:
+
+- Obsahuje každý znak a speciální klávesu, která je běžnou součástí počítačové klávesnice. To přijde vhod obzvláště při používání aplikací jako např. Termux
+
+- Můžete používat modifikační klávesy, obohaceny o speciální klávesy (např. Tab, Esc, šipky, F klávesy, ale také Ctrl nebo Alt !)
+
+- Můžete psát vícero jazyky rychleji a bez chyb. Diakritická znaménka mohou být vyvolána i za pomocí mrtvých kláves. Nejdříve zvolte diakritické znaménko a pak znak, který chcete obohatit o toto znaménko.
+
+- Je vysoce nenáročná a rychlá. Zabere 500x méně místa než klávesnice od Googlu (Gboard) a 15x méně než výchozí klávesnice systému. Bez reklam, bez sledování.
+
+- Má vícero rozložení: QWERTY, QWERTZ, AZERTY. Motivy: Bílá, Tmavá, OLED Černá. A mnoho dalších které si s drobnou znalostí programování můžete upravovat dle libosti.
+
+Nezapomeňte... Jako každá virtuální klávesnice, i tato musí být aktivována v nastavení systému (zařízení). Otevřte (Systémové) Nastavení a přejděte na:
+(Další nastavení NEBO Nastavení systému) > Jazyk & způsob zadávání > Spravovat klávesnice.

metadata/android/cs-CZ/short_description.txt

@@ -0,0 +1 @@
+Nenáročná virtuální klávesnice pro vývojáře.

metadata/android/cs-CZ/title.txt

@@ -0,0 +1 @@
+Klávesnice Unexpected

metadata/android/en-US/changelogs/19.txt

@@ -0,0 +1,21 @@
+Translations: Brazilian portuguese (@igorSilCar), Chinese-Simplified (@9-2-1), Korean (@notnickid)
+New layouts: Swedish (@thabubble), Korean (@notnickid)
+
+Improved computation of the swipe gesture and fix unstoppable key-repeat on
+some devices.
+
+Moved keys away from the edges of the screen and other improvements to the layouts.
+
+Improved rendering of some symbols.
+
+Added more characters to the keyboard:
+- New combinations to Fn (@ArenaL5)
+- Currency symbols
+- Added arrow and box symbols (@sdrapha)
+- F11 and F12.
+
+Option for making modifiers lockable. (@sdrapha)
+Fixes to the Spanish layout and other fixes. (@ArenaL5)
+Many other fixes.
+
+Huge thanks to the contributors: @igorSilCar, @sdrapha, @ArenaL5, @notnickid, @9-2-1, @thabubble

metadata/android/en-US/changelogs/20.txt

@@ -0,0 +1,25 @@
+Quick fix release.
+
+Previously:
+
+Translations: Brazilian portuguese (@igorSilCar), Chinese-Simplified (@9-2-1), Korean (@notnickid)
+New layouts: Swedish (@thabubble), Korean (@notnickid)
+
+Improved computation of the swipe gesture and fix unstoppable key-repeat on
+some devices.
+
+Moved keys away from the edges of the screen and other improvements to the layouts.
+
+Improved rendering of some symbols.
+
+Added more characters to the keyboard:
+- New combinations to Fn (@ArenaL5)
+- Currency symbols
+- Added arrow and box symbols (@sdrapha)
+- F11 and F12.
+
+Option for making modifiers lockable. (@sdrapha)
+Fixes to the Spanish layout and other fixes. (@ArenaL5)
+Many other fixes.
+
+Huge thanks to the contributors: @igorSilCar, @sdrapha, @ArenaL5, @notnickid, @9-2-1, @thabubble

metadata/android/en-US/changelogs/21.txt

@@ -0,0 +1,4 @@
+Fix compatibility with Android 6.
+Translation improvements.
+
+Huge thanks to the contributors: @marciozomb13

metadata/android/en-US/changelogs/22.txt

@@ -0,0 +1,7 @@
+Support languages: Lithuanian, Hungarian (@tbilles)
+New layouts: Neo2 (@matthiakl)
+
+Translation improvements (@polyctena, @marciozomb13)
+Fix modifiers applied twice when typing quickly. Some other fixes.
+
+Many thanks to the contributors: @matthiakl, @polyctena, @marciozomb13, @dircsem

metadata/android/en-US/changelogs/23.txt

@@ -0,0 +1,9 @@
+New languages: Turkish (@erqan), Dutch (Belgium) (@draxaris1010)
+New layouts: Turkish (@erqan), Colemak (@dircsem), Hungarian QWERTY
+
+Less typos: Select the closest key on swipe (@Rodrigodd)
+Removed settings: Vibration, Show every accents
+More tweaks to the layouts
+Fixes to landscape mode, updated translations and more tweaks.
+
+Thanks to the contributors: @erqan, @draxaris1010, @dircsem, @Rodrigodd, @meanindra

metadata/android/en-US/changelogs/24.txt

@@ -0,0 +1,5 @@
+Add back the vibration option.
+Fix localized keys not in predefined positions.
+Improvements to layouts.
+
+Thanks to the contributors: @Thunder-Squirrel

metadata/android/en-US/changelogs/25.txt

@@ -0,0 +1,12 @@
+New supported languages: Polish, Ukrainian, Bengali, Norwegian
+New layouts: Ukrainian, Bengali, Norwegian, Bone, Czech
+New translations: Brazilian Portuguese, Italian, Russian, Czech
+
+Hold modifiers to lock, double tap on shift disabled by default.
+Option to add more keys to the keyboard.
+Automatic capitalisation at beginning of sentences.
+Added e-ink oriented theme.
+New pane for greek letters and mathematical symbols.
+Improvements to the layouts and various bug fixes.
+
+Thanks to the contributors: @nanno, @Quantenzitrone, @eandersons, @iamrasel, @ChristianGynnild, @igorSilCar, @CastixGitHub, @94KONG, @ptrm, @Validbit

metadata/android/it-IT/short_description.txt

@@ -0,0 +1 @@
+Una Tastiera Virtuale Leggera Per La Programmazione

metadata/android/it-IT/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

metadata/android/ko-KR/full_description.txt

@@ -0,0 +1,18 @@
+이 앱은 안드로이드용 가상 키보드입니다. 주요 기능은 스와이프 제스처를 사용하여 모든 ASCII 문자를 쉽게 입력할 수 있다는 점과 악센트 및 수정자 키를 위한 데드 키와 특수 키(tab, esc, 방향키 등)이 있다는 것입니다.
+
+키보드는 각 키의 모서리에 최대 4개의 추가 문자를 표시합니다. 이러한 추가 문자는 키에서 손가락을 스와이프하여 적중됩니다.
+
+일부 하이라이트 기능:
+
+- PC 키보드에서 사용할 수 있는 모든 문자 및 특수 키를 사요 가능합니다. 이것은 Termux와 같은 앱을 사용하는 데 효과적입니다.
+
+- 여기에는 Tab, Esc, 방향키 및 function 키뿐만이 아닌 Ctrl 및 Alt 키도 포함되어 있습니다 !
+
+- 악센트 키는 데드 키를 사용하여 액세스할 수 있습니다. 먼저 악센트 키를 활성화한 다음 악센트 문자를 입력합니다.
+
+- 매우 가볍고 빠릅니다. Google 키보드보다 500배, 기본 키보드보다 15배 적은 공간을 사용합니다. 광고와 사용 기록 추적 없음.
+
+- 다중 레이아웃: QWERTY, QWERTZ, AZERTY. 다양한 테마: White, Dark, OLED Black. 또한 다른 많은 옵션들.
+
+다른 가상 키보드와 마찬가지로 시스템 설정에서 활성화해야 합니다. 시스템 설정을 열고 다음으로 이동합니다.
+시스템 > 언어 및 입력 > 키보드 > 키보드 관리.

metadata/android/ko-KR/short_description.txt

@@ -0,0 +1 @@
+개발자들을 위한 가벼운 가상 키보드.

metadata/android/ko-KR/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

metadata/android/pt-BR/full_description.txt

@@ -0,0 +1,18 @@
+Um teclado virtual para aparelhos Android. Os recursos principais são facilidade de digitar todos os caracteres ASCII deslizando o dedo, teclas "mortas" para acentos e teclas modificadoras e a presença de teclas especiais (tab, esc, setas, etc..).
+
+O teclado mostra até 4 caracteres extras nos cantos de cada tecla. Esses caracteres são digitáveis com o deslizar do dedo na tecla.
+
+Alguns dos recursos interessantes:
+
+- Todos caracteres e teclas especiais que também estão disponíveis num teclado de PC. Perfeito para usar com aplicativos como Termux.
+
+- Incluindo Tab, Esc, as setas e teclas de função, e também Ctrl e Alt!
+
+- Caracteres acentuados são digitáveis usando teclas "mortas". Primeiro ative o acento e depois digite a letra.
+
+- Muito leve e rápido. Ocupa 500x menos espaço que o teclado da Google e 15x menos espaço que o teclado padrão. Sem propaganda, sem rastreio.
+
+- Vários layouts: QWERTY, QWERTZ, AZERTY. Temas: Branco, Escuro, Preto OLED. E muitas outras opções.
+
+Como qualquer outro teclado virtual, tem de ser ativado nas configurações de sistema. Abra as configurações e vá para:
+Sistema > Idioma e entrada > Teclado virtual > Gerenciar teclados virtuais.

metadata/android/pt-BR/short_description.txt

@@ -0,0 +1 @@
+Um teclado virtual leve para desenvolvedores.

metadata/android/pt-BR/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

res/values-cs/strings.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Klávesnice Unexpected (pro ladění)</string>
+  <string name="app_name" product="default">Klávesnice Unexpected</string>
+  <string name="settings_activity_label">Nastavení Klávesnice Unexpected</string>
+  <string name="pref_category_layout">Rozvržení</string>
+  <string name="pref_layout_title">Změnit rozvržení klávesnice</string>
+  <string name="pref_layout_e_system">V nastavení systému</string>
+  <string name="pref_accents_title">(Univerzální) Diakritická znaménka</string>
+  <string name="pref_accents_e_all_installed">Zobrazovat znaménka pro všechny instalované systémové jazyky</string>
+  <string name="pref_accents_e_selected">Zobrazovat znaménka pouze pro současně zvolený jazyk</string>
+  <string name="pref_accents_e_none">Skrýt (univerzální) diakritická znaménka</string>
+  <string name="pref_autocapitalisation_title">Automatická kapitalizace</string>
+  <string name="pref_autocapitalisation_summary">Stiskne Shift na začátku věty</string>
+  <string name="pref_programming_layout_title">Rozložení klávesnice pro programování</string>
+  <string name="pref_programming_layout_none">Žádné</string>
+  <string name="pref_category_typing">Psaní</string>
+  <string name="pref_swipe_dist_title">Vzdálenost posunutí prstem</string>
+  <string name="pref_swipe_dist_summary">Jak daleko je třeba posunout prst pro napsaní znaku/diakritiky v rozích klávey (%s)</string>
+  <string name="pref_long_timeout_title">Časová prodleva opakování znaků</string>
+  <string name="pref_long_interval_title">Interval opakování znaků</string>
+  <string name="pref_vibrate_title">Vibrace</string>
+  <string name="pref_vibrate_summary">Zapnout/Vypnout vibrace při stisku klávesy</string>
+  <string name="pref_precise_repeat_title">Precizní posun kurzoru</string>
+  <string name="pref_precise_repeat_summary">Zda-li posun prstem ovlivňuje rychlost kurzoru</string>
+  <string name="pref_lockable_keys_title">Zastaralé: Zamykatelné modifikační klávesy</string>
+  <string name="pref_lockable_keys_summary">Tato možnost bude v budoucnu odebrána</string>
+  <string name="pref_lock_double_tap_title">Dvojklik pro aktivaci caps lock(u)</string>
+  <string name="pref_lock_double_tap_summary">Dvojklik namísto držení modifikačních kláves po nějakou dobu</string>
+  <string name="pref_category_style">Styl</string>
+  <string name="pref_margin_bottom_title">Spodní odsazení</string>
+  <string name="pref_keyboard_height_title">Výška klávesnice</string>
+  <string name="pref_keyboard_height_landscape_title">Výška klávesnice v režimu na šířku</string>
+  <string name="pref_horizontal_margin_title">Boční odsazení</string>
+  <string name="pref_character_size_title">Velikost znaků</string>
+  <string name="pref_character_size_summary">Velikost znaků zobrazených na klávesnici (%.2fx)</string>
+  <string name="pref_theme">Motiv</string>
+  <string name="pref_theme_e_system">Dle systému</string>
+  <string name="pref_theme_e_dark">Tmavý</string>
+  <string name="pref_theme_e_light">Světlý</string>
+  <string name="pref_theme_e_black">Černý</string>
+  <string name="pref_swipe_dist_e_very_short">Velmi krátká</string>
+  <string name="pref_swipe_dist_e_short">Krátká</string>
+  <string name="pref_swipe_dist_e_default">Běžná</string>
+  <string name="pref_swipe_dist_e_far">Dlouhá</string>
+  <string name="pref_swipe_dist_e_very_far">Velmi dlouhá</string>
+  <string name="pref_key_horizontal_space">Horizontální mezery mezi klávesami</string>
+  <string name="pref_key_vertical_space">Vertikální mezery mezi klávesami</string>
+  <string name="key_action_next">Další</string>
+  <string name="key_action_done">Dokončit</string>
+  <string name="key_action_go">Spustit</string>
+  <string name="key_action_prev">Předchozí</string>
+  <string name="key_action_search">Hledat</string>
+  <string name="key_action_send">Odeslat</string>
+</resources>

res/values-de/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</string>
   <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Tastaturlayout ändern</string>
@@ -8,17 +7,16 @@
   <string name="pref_accents_title">Akzente</string>
   <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
   <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
-  <string name="pref_accents_e_all">Alle Akzente anzeigen</string>
   <string name="pref_accents_e_none">Akzente verbergen</string>
+  <string name="pref_programming_layout_title">Tastaturlayout zum Programmieren</string>
+  <string name="pref_programming_layout_none">Keines</string>
   <string name="pref_category_typing">Tippen</string>
   <string name="pref_swipe_dist_title">Länge der Wischgeste</string>
   <string name="pref_swipe_dist_summary">Abstand der Zeichen in den Ecken der Tasten (%s)</string>
   <string name="pref_long_timeout_title">Zeitüberschreitung bei Tastenwiederholung</string>
   <string name="pref_long_interval_title">Intervall der Tastenwiederholung</string>
-  <string name="pref_category_vibrate">Vibration</string>
   <string name="pref_vibrate_title">Vibration</string>
   <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
-  <string name="pref_vibrate_duration_title">Dauer</string>
   <string name="pref_precise_repeat_title">Präzise Cursorsteuerung</string>
   <string name="pref_precise_repeat_summary">Geschwindigkeit der Tastenwiederholung durch weniger oder mehr Wischen anpassen</string>
   <string name="pref_category_style">Design</string>

res/values-es/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Ajustes de Unexpected Keyboard</string>
   <string name="pref_category_layout">Formato</string>
   <string name="pref_layout_title">Cambiar formato de teclado</string>
@@ -8,17 +7,14 @@
   <string name="pref_accents_title">Acentos</string>
   <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
   <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</string>
-  <string name="pref_accents_e_all">Mostrar todos los acentos</string>
   <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_category_typing">Escribiendo</string>
   <string name="pref_swipe_dist_title">Distancia para deslizar</string>
-  <string name="pref_swipe_dist_summary">Distancia de caractéres en las esquinas de las letras (%s)</string>
+  <string name="pref_swipe_dist_summary">Distancia de caracteres en las esquinas de las letras (%s)</string>
   <string name="pref_long_timeout_title">Tiempo de espera de repetición de tecla</string>
   <string name="pref_long_interval_title">Intervalo de repetición de tecla</string>
-  <string name="pref_category_vibrate">Vibración</string>
   <string name="pref_vibrate_title">Vibración</string>
   <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
-  <string name="pref_vibrate_duration_title">Duración</string>
   <string name="pref_precise_repeat_title">Movimientos de cursor preciso</string>
   <string name="pref_precise_repeat_summary">Modular la velocidad de repetición de teclas según si se desliza más o menos</string>
   <string name="pref_category_style">Estilo</string>
@@ -26,7 +22,7 @@
   <string name="pref_keyboard_height_title">Altura del teclado</string>
   <string name="pref_horizontal_margin_title">Margen horizontal</string>
   <string name="pref_character_size_title">Tamaño de etiqueta</string>
-  <string name="pref_character_size_summary">Tamaño de caractéres mostrados en el teclado (%.2fx)</string>
+  <string name="pref_character_size_summary">Tamaño de caracteres mostrados en el teclado (%.2fx)</string>
   <string name="pref_theme">Tema</string>
   <string name="pref_theme_e_system">Ajustes de sistema</string>
   <string name="pref_theme_e_dark">Oscuro</string>

res/values-fr/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard Paramètres</string>
   <string name="pref_category_layout">Disposition</string>
   <string name="pref_layout_title">Disposition des touches</string>
@@ -8,22 +7,22 @@
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
   <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
-  <string name="pref_accents_e_all">Afficher tous les accents</string>
   <string name="pref_accents_e_none">Cacher les accents</string>
+  <string name="pref_autocapitalisation_title">Majuscule automatique</string>
+  <string name="pref_autocapitalisation_summary">Active Shift au début des phrases</string>
   <string name="pref_category_typing">Saisie</string>
   <string name="pref_swipe_dist_title">Distance de swipe</string>
   <string name="pref_swipe_dist_summary">La distance des caractères dans les coins (%s)</string>
   <string name="pref_long_timeout_title">Délai avant répétition</string>
   <string name="pref_long_interval_title">Écart entre répétitions</string>
-  <string name="pref_category_vibrate">Vibration</string>
   <string name="pref_vibrate_title">Vibreur</string>
   <string name="pref_vibrate_summary">Vibration a chaque touche</string>
-  <string name="pref_vibrate_duration_title">Durée</string>
   <string name="pref_precise_repeat_title">Mouvement précis du curseur</string>
   <string name="pref_precise_repeat_summary">Modifier la vitesse de répétition en bougeant le doigt</string>
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Marge du bas</string>
   <string name="pref_keyboard_height_title">Hauteur du clavier</string>
+  <string name="pref_keyboard_height_landscape_title">Hauteur du clavier en mode paysage</string>
   <string name="pref_horizontal_margin_title">Marge des côtés</string>
   <string name="pref_character_size_title">Taille des labels</string>
   <string name="pref_character_size_summary">Taille des caractères affichés sur les touches (%.2fx)</string>
@@ -32,6 +31,7 @@
   <string name="pref_theme_e_dark">Sombre</string>
   <string name="pref_theme_e_light">Clair</string>
   <string name="pref_theme_e_black">Noir</string>
+  <string name="pref_theme_e_white">Blanc</string>
   <string name="pref_swipe_dist_e_very_short">Très courte</string>
   <string name="pref_swipe_dist_e_short">Courte</string>
   <string name="pref_swipe_dist_e_default">Normale</string>

res/values-it/strings.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
+  <string name="settings_activity_label">Impostazioni di Unexpected Keyboard</string>
+  <string name="pref_category_layout">Layout</string>
+  <string name="pref_layout_title">Cambia layout tastiera</string>
+  <string name="pref_layout_e_system">Impostazioni di sistema</string>
+  <string name="pref_accents_title">Accenti</string>
+  <string name="pref_accents_e_all_installed">Mostra accenti per tutte le lingue installate</string>
+  <string name="pref_accents_e_selected">Mostra accenti solo per le lingue selezionate</string>
+  <string name="pref_accents_e_none">Nascondi accenti</string>
+  <string name="pref_autocapitalisation_title">Maiuscole Automatiche</string>
+  <string name="pref_autocapitalisation_summary">Premi Shift all\'inizio di una frase</string>
+  <string name="pref_programming_layout_title">Layout tastiera per programmare</string>
+  <string name="pref_programming_layout_none">Nessuno</string>
+  <string name="pref_category_typing">Digitando</string>
+  <string name="pref_swipe_dist_title">Distanza swipe</string>
+  <string name="pref_swipe_dist_summary">Distanza dei caratteri negli angoli dei tasti (%s)</string>
+  <string name="pref_long_timeout_title">Timeout ripetizione tasto</string>
+  <string name="pref_long_interval_title">Intervallo ripetizione tasto</string>
+  <string name="pref_vibrate_title">Vibrazione</string>
+  <string name="pref_vibrate_summary">Abilita/Disabilita Vibrazione alla pressione dei tasti</string>
+  <string name="pref_precise_repeat_title">Movimento puntatore preciso</string>
+  <string name="pref_precise_repeat_summary">Modula la veocità della ripetizione con lo swipe</string>
+  <string name="pref_lockable_keys_title">Deprecato: Modificatori bloccabili</string>
+  <string name="pref_lock_double_tap_title">Doppio tocco su Shift per attivare CapsLock</string>
+  <string name="pref_lock_double_tap_summary">Invece di premere i modificatori a lungo</string>
+  <string name="pref_category_style">Stile</string>
+  <string name="pref_margin_bottom_title">Margine inferiore</string>
+  <string name="pref_keyboard_height_title">Altezza tastiera</string>
+  <string name="pref_keyboard_height_landscape_title">Altezza tastiera in modalità orizzontale</string>
+  <string name="pref_horizontal_margin_title">Margine orizzontale</string>
+  <string name="pref_character_size_title">Dimensione Caratteri</string>
+  <string name="pref_character_size_summary">Dimensione dei caratteri mostrati sulla tastiera (%.2fx)</string>
+  <string name="pref_theme">Tema</string>
+  <string name="pref_theme_e_system">Impostazioni di sistema</string>
+  <string name="pref_theme_e_dark">Scuro</string>
+  <string name="pref_theme_e_light">Chiaro</string>
+  <string name="pref_theme_e_black">Nero</string>
+  <string name="pref_swipe_dist_e_very_short">Veramente breve</string>
+  <string name="pref_swipe_dist_e_short">Breve</string>
+  <string name="pref_swipe_dist_e_default">Normale</string>
+  <string name="pref_swipe_dist_e_far">Distante</string>
+  <string name="pref_swipe_dist_e_very_far">Molto distante</string>
+  <string name="pref_key_horizontal_space">Spazio orizzontale tra i tasti</string>
+  <string name="pref_key_vertical_space">Spazio verticale tra i tasti</string>
+  <string name="key_action_next">Prossimo</string>
+  <string name="key_action_done">Fatto</string>
+  <string name="key_action_go">Vai</string>
+  <string name="key_action_prev">Precedente</string>
+  <string name="key_action_search">Cerca</string>
+  <string name="key_action_send">Invia</string>
+</resources>

res/values-ko/strings.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="settings_activity_label">Unexpected Keyboard 설정</string>
+  <string name="pref_category_layout">레이아웃</string>
+  <string name="pref_layout_title">키보드 레이아웃 변경</string>
+  <string name="pref_layout_e_system">시스템 세팅</string>
+  <string name="pref_accents_title">악센트</string>
+  <string name="pref_accents_e_all_installed">설치된 모든 언어의 악센트 표시</string>
+  <string name="pref_accents_e_selected">선택한 언어의 악센트만 표시</string>
+  <string name="pref_accents_e_none">모든 언어의 악센트 숨기기</string>
+  <string name="pref_category_typing">타자</string>
+  <string name="pref_swipe_dist_title">스와이프 범위</string>
+  <string name="pref_swipe_dist_summary">키 모서리 문자의 입력 범위 (%s)</string>
+  <string name="pref_long_timeout_title">키 길게 누르기 지연</string>
+  <string name="pref_long_interval_title">키 반복 간격</string>
+  <string name="pref_vibrate_title">진동</string>
+  <string name="pref_vibrate_summary">키 누를 때 진동 키거/끄기</string>
+  <string name="pref_precise_repeat_title">정확한 커서 움직임</string>
+  <string name="pref_precise_repeat_summary">더 많거나 적은 스와이프로 키 반복 조절</string>
+  <string name="pref_category_style">스타일</string>
+  <string name="pref_margin_bottom_title">아래 넓이</string>
+  <string name="pref_keyboard_height_title">키보드 높이</string>
+  <string name="pref_horizontal_margin_title">양 옆 넓이</string>
+  <string name="pref_character_size_title">폰트 크기</string>
+  <string name="pref_character_size_summary">키보드의 표시되는 폰트 크기 (%.2fx)</string>
+  <string name="pref_theme">테마</string>
+  <string name="pref_theme_e_system">시스템 테마</string>
+  <string name="pref_theme_e_dark">Dark</string>
+  <string name="pref_theme_e_light">Light</string>
+  <string name="pref_theme_e_black">Black</string>
+  <string name="pref_swipe_dist_e_very_short">매우 짧음</string>
+  <string name="pref_swipe_dist_e_short">짧음</string>
+  <string name="pref_swipe_dist_e_default">보통</string>
+  <string name="pref_swipe_dist_e_far">넓음</string>
+  <string name="pref_swipe_dist_e_very_far">매우 넓음</string>
+  <string name="pref_key_horizontal_space">키보드 양 옆 간격</string>
+  <string name="pref_key_vertical_space">키보드 세로 간격</string>
+  <string name="key_action_next">다음</string>
+  <string name="key_action_done">확인</string>
+  <string name="key_action_go">Go</string>
+  <string name="key_action_prev">이전</string>
+  <string name="key_action_search">검색</string>
+  <string name="key_action_send">보내기</string>
+</resources>

res/values-land/dimens.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <dimen name="horizontal_margin">12dp</dimen>
-  <dimen name="margin_bottom">3dp</dimen>
-  <dimen name="key_padding">3dp</dimen>
-  <dimen name="key_height">36dp</dimen>
-  <item name="label_text_size" type="integer" format="float">0.4</item>
-  <item name="sublabel_text_size" type="integer" format="float">0.3</item>
   <dimen name="emoji_type_button_height">48dp</dimen>
-  <dimen name="extra_horizontal_margin">20dp</dimen>
+  <dimen name="extra_horizontal_margin">25dp</dimen>
 </resources>

res/values-lv/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
+  <string name="app_name" product="debug">Unexpected Keyboard (atkļūdošana)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard iestatījumi</string>
   <string name="pref_category_layout">Izkārtojums</string>
   <string name="pref_layout_title">Mainīt tastatūras izkārtojumu</string>
@@ -8,22 +9,29 @@
   <string name="pref_accents_title">Uzsvara zīmes</string>
   <string name="pref_accents_e_all_installed">Rādīt uzsvara zīmes visām uzstādītajām valodām</string>
   <string name="pref_accents_e_selected">Rādīt uzsvara zīmes tikai atlasītajām valodām</string>
-  <string name="pref_accents_e_all">Rādīt visas uzsvara zīmes</string>
   <string name="pref_accents_e_none">Paslēpt uzsvara zīmes</string>
+  <string name="pref_autocapitalisation_title">Automātiski lielie burti</string>
+  <string name="pref_autocapitalisation_summary">Piespiest Shift teikuma sākumā</string>
+  <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
+  <string name="pref_programming_layout_title">Tastatūras izkārtojums programmēšanai</string>
+  <string name="pref_programming_layout_none">Neviens</string>
   <string name="pref_category_typing">Rakstīšana</string>
   <string name="pref_swipe_dist_title">Pavilkšanas attālums</string>
   <string name="pref_swipe_dist_summary">Taustiņu stūros esošo rakstzīmju attālums (%s)</string>
   <string name="pref_long_timeout_title">Taustiņa atkārtošanās ātrums</string>
   <string name="pref_long_interval_title">Taustiņa atkārtošanās aizture</string>
-  <string name="pref_category_vibrate">Trīcēšana</string>
   <string name="pref_vibrate_title">Trīcēšana</string>
   <string name="pref_vibrate_summary">Iespējot/atspējot taustiņa piespiešanas trīcēšanu</string>
-  <string name="pref_vibrate_duration_title">Ilgums</string>
   <string name="pref_precise_repeat_title">Pielāgojama kursora kustība</string>
   <string name="pref_precise_repeat_summary">Mainīt taustiņa atkārtošanās ātrumu ar pavilkšanas attālumu</string>
+  <string name="pref_lockable_keys_title">Novecojis: Slēdzami pārveidotāji</string>
+  <string name="pref_lockable_keys_summary">Šī iespēja tiks noņemta</string>
+  <string name="pref_lock_double_tap_title">Divkāršs piesitiens burtslēgam</string>
+  <string name="pref_lock_double_tap_summary">Tā vietā, lai ilstoši piespiestu pārveidotāju</string>
   <string name="pref_category_style">Izskata pielāgojumi</string>
   <string name="pref_margin_bottom_title">Apakšējā apmale</string>
   <string name="pref_keyboard_height_title">Tastatūras augstums</string>
+  <string name="pref_keyboard_height_landscape_title">Tastatūras augstums guleniski</string>
   <string name="pref_horizontal_margin_title">Līmeniskā apmale</string>
   <string name="pref_character_size_title">Iezīmes izmērs</string>
   <string name="pref_character_size_summary">Tastatūrā attēloto rakstzīmju izmērs (%.2fx)</string>
@@ -37,6 +45,8 @@
   <string name="pref_swipe_dist_e_default">Vidējs</string>
   <string name="pref_swipe_dist_e_far">Tāls</string>
   <string name="pref_swipe_dist_e_very_far">Ļoti tāls</string>
+  <string name="pref_key_horizontal_space">Līmeniskais attālums starp taustiņiem</string>
+  <string name="pref_key_vertical_space">Stateniskais attālums starp taustiņiem</string>
   <string name="key_action_next">Nākamais</string>
   <string name="key_action_done">Darīts</string>
   <string name="key_action_go">Aiziet</string>

res/values-pt/strings.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Teclado Unexpected</string>
+  <string name="app_name" product="default">Teclado Unexpected</string>
+  <string name="settings_activity_label">Configurar Teclado Unexpected</string>
+  <string name="pref_category_layout">Layout</string>
+  <string name="pref_layout_title">Mudar layout do teclado</string>
+  <string name="pref_layout_e_system">Mesmo do sistema</string>
+  <string name="pref_accents_title">Acentos</string>
+  <string name="pref_accents_e_all_installed">Mostrar acentos para todos os idiomas instalados</string>
+  <string name="pref_accents_e_selected">Mostrar acentos só para o idioma selecionado</string>
+  <string name="pref_accents_e_none">Ocultar acentos</string>
+  <string name="pref_autocapitalisation_title">Maiusculização automática</string>
+  <string name="pref_autocapitalisation_summary">Aciona o shift no início de cada frase</string>
+  <string name="pref_programming_layout_title">Layout do teclado para programação</string>
+  <string name="pref_programming_layout_none">Nenhum</string>
+  <string name="pref_category_typing">Digitação</string>
+  <string name="pref_swipe_dist_title">Distância a deslizar</string>
+  <string name="pref_swipe_dist_summary">Distância até acionar os cantos das teclas (%s)</string>
+  <string name="pref_long_timeout_title">Tempo até repetir tecla</string>
+  <string name="pref_long_interval_title">Intervalo de repetição de tecla</string>
+  <string name="pref_vibrate_title">Vibração</string>
+  <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
+  <string name="pref_precise_repeat_title">Precisão nos movimentos do cursor</string>
+  <string name="pref_precise_repeat_summary">Varia a velocidade de repetição a depender do quanto deslizar</string>
+  <string name="pref_lockable_keys_title">Descontinuado: Modificadores fixáveis</string>
+  <string name="pref_lockable_keys_summary">Essa opção será removida</string>
+  <string name="pref_lock_double_tap_title">Tecle duas vezes no shift para caixa alta</string>
+  <string name="pref_lock_double_tap_summary">Ao invés de apertar e segurar por um tempo</string>
+  <string name="pref_category_style">Estilo</string>
+  <string name="pref_margin_bottom_title">Margem inferior</string>
+  <string name="pref_keyboard_height_title">Altura do teclado</string>
+  <string name="pref_keyboard_height_landscape_title">Altura do teclado em modo paisagem</string>
+  <string name="pref_horizontal_margin_title">Margem horizontal</string>
+  <string name="pref_character_size_title">Tamanho dos indicadores</string>
+  <string name="pref_character_size_summary">Tamanho dos caracteres visíveis no teclado (%.2fx)</string>
+  <string name="pref_theme">Tema</string>
+  <string name="pref_theme_e_system">Mesmo do sistema</string>
+  <string name="pref_theme_e_dark">Escuro</string>
+  <string name="pref_theme_e_light">Claro</string>
+  <string name="pref_theme_e_black">Preto</string>
+  <string name="pref_swipe_dist_e_very_short">Muito curto</string>
+  <string name="pref_swipe_dist_e_short">Curto</string>
+  <string name="pref_swipe_dist_e_default">Normal</string>
+  <string name="pref_swipe_dist_e_far">Longo</string>
+  <string name="pref_swipe_dist_e_very_far">Muito longo</string>
+  <string name="pref_key_horizontal_space">Distância horizontal entre teclas</string>
+  <string name="pref_key_vertical_space">Distância vertical entre teclas</string>
+  <string name="key_action_next">Próximo</string>
+  <string name="key_action_done">Pronto</string>
+  <string name="key_action_go">Ir</string>
+  <string name="key_action_prev">Anterior</string>
+  <string name="key_action_search">Buscar</string>
+  <string name="key_action_send">Enviar</string>
+</resources>

res/values-ru/strings.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Unexpected Keyboard</string>
+  <string name="settings_activity_label">Unexpected Keyboard Настройки</string>
+  <string name="pref_category_layout">Расположение</string>
+  <string name="pref_layout_title">Изменить раскладку клавиатуры</string>
+  <string name="pref_layout_e_system">Системные настройки</string>
+  <string name="pref_accents_title">Акцент</string>
+  <string name="pref_accents_e_all_installed">Показывать акценты для всех установленных языков</string>
+  <string name="pref_accents_e_selected">Показывать акценты только для выбранного языка</string>
+  <string name="pref_accents_e_none">Скрыть акценты</string>
+  <string name="pref_programming_layout_title">Раскладка клавиатуры для программирования</string>
+  <string name="pref_programming_layout_none">Нету</string>
+  <string name="pref_category_typing">Печатание</string>
+  <string name="pref_swipe_dist_title">Расстояние пролистывания</string>
+  <string name="pref_swipe_dist_summary">Расстояние между символами в углах клавиш (%s)</string>
+  <string name="pref_long_timeout_title">Тайм-аут повтора ключа</string>
+  <string name="pref_long_interval_title">Интервал повторения клавиш</string>
+  <string name="pref_vibrate_title">Вибрация</string>
+  <string name="pref_vibrate_summary">Включение/выключение вибрации при нажатии клавиши</string>
+  <string name="pref_precise_repeat_title">Точные перемещения курсора</string>
+  <string name="pref_precise_repeat_summary">Модулируйте скорость повторения клавиш, проводя пальцем больше или меньше</string>
+  <string name="pref_lockable_keys_title">Запираемые модификаторы</string>
+  <string name="pref_lockable_keys_summary">Модификаторы, которые можно заблокировать, введя их дважды</string>
+  <string name="pref_category_style">Стиль</string>
+  <string name="pref_margin_bottom_title">Нижняя граница поля</string>
+  <string name="pref_keyboard_height_title">Высота клавиатуры</string>
+  <string name="pref_keyboard_height_landscape_title">Высота клавиатуры в ландшафтном режиме</string>
+  <string name="pref_horizontal_margin_title">Горизонтальное поле</string>
+  <string name="pref_character_size_title">Размер этикетки</string>
+  <string name="pref_character_size_summary">Размер символов, отображаемых на клавиатуре (%.2fx)</string>
+  <string name="pref_theme">Тема</string>
+  <string name="pref_theme_e_system">Системные настройки</string>
+  <string name="pref_theme_e_dark">Темный</string>
+  <string name="pref_theme_e_light">Светлый</string>
+  <string name="pref_theme_e_black">Черный</string>
+  <string name="pref_swipe_dist_e_very_short">Очень короткий</string>
+  <string name="pref_swipe_dist_e_short">Короткий</string>
+  <string name="pref_swipe_dist_e_default">Обычный</string>
+  <string name="pref_swipe_dist_e_far">Far</string>
+  <string name="pref_swipe_dist_e_very_far">Очень далеко</string>
+  <string name="pref_key_horizontal_space">Горизонтальное расстояние между клавишами</string>
+  <string name="pref_key_vertical_space">Расстояние по вертикали между клавишами</string>
+  <string name="key_action_next">Next</string>
+  <string name="key_action_done">Ввод</string>
+  <string name="key_action_go">Go</string>
+  <string name="key_action_prev">Предыдущий</string>
+  <string name="key_action_search">Поиск</string>
+  <string name="key_action_send">Отправить</string>
+</resources>

res/values-tr/strings.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
+  <string name="settings_activity_label">Unexpected Keyboard Ayarları</string>
+  <string name="pref_category_layout">Düzen</string>
+  <string name="pref_layout_title">Klavye Düzenini Değiştir</string>
+  <string name="pref_layout_e_system">Sistem Ayarları</string>
+  <string name="pref_accents_title">Aksanlar</string>
+  <string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
+  <string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
+  <string name="pref_accents_e_none">Aksanları gizle</string>
+  <string name="pref_programming_layout_title">Programlama için klavye düzeni</string>
+  <string name="pref_programming_layout_none">Hiçbiri</string>
+  <string name="pref_category_typing">Yazma</string>
+  <string name="pref_swipe_dist_title">Kaydırma mesafesi</string>
+  <string name="pref_swipe_dist_summary">Tuşların köşelerindeki karakterlerin uzaklıkları (%s)</string>
+  <string name="pref_long_timeout_title">Tuş tekrarlama beklemesi</string>
+  <string name="pref_long_interval_title">Tuş tekrarlama aralığı</string>
+  <string name="pref_vibrate_title">Titreşim</string>
+  <string name="pref_vibrate_summary">Tuşa basıldığında titreşimi etkinleştir</string>
+  <string name="pref_precise_repeat_title">İmleç hareketini ayarla</string>
+  <string name="pref_precise_repeat_summary">Tuş tekrar hızını az ya da çok kaydırarak ayarla</string>
+  <string name="pref_category_style">Stil</string>
+  <string name="pref_margin_bottom_title">Alt boşluk</string>
+  <string name="pref_keyboard_height_title">Klavye yüksekliği</string>
+  <string name="pref_horizontal_margin_title">Yatay boşluk</string>
+  <string name="pref_character_size_title">Etiket boyutu</string>
+  <string name="pref_character_size_summary">Klavye üzerinde gösterilecek karakter boyutu (%.2fx)</string>
+  <string name="pref_theme">Tema</string>
+  <string name="pref_theme_e_system">Sistem Ayarları</string>
+  <string name="pref_theme_e_dark">Koyu</string>
+  <string name="pref_theme_e_light">Açık</string>
+  <string name="pref_theme_e_black">Siyah</string>
+  <string name="pref_swipe_dist_e_very_short">Çok kısa</string>
+  <string name="pref_swipe_dist_e_short">Kısa</string>
+  <string name="pref_swipe_dist_e_default">Normal</string>
+  <string name="pref_swipe_dist_e_far">Uzun</string>
+  <string name="pref_swipe_dist_e_very_far">Çok uzun</string>
+  <string name="pref_key_horizontal_space">Tuşlar arasındaki yatay boşluk</string>
+  <string name="pref_key_vertical_space">Tuşlar arasındaki dikey boşluk</string>
+  <string name="key_action_next">İleri</string>
+  <string name="key_action_done">Bitti</string>
+  <string name="key_action_go">İlerle</string>
+  <string name="key_action_prev">Geri</string>
+  <string name="key_action_search">Ara</string>
+  <string name="key_action_send">Gönder</string>
+</resources>

res/values-zh-rCN/strings.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
+  <string name="settings_activity_label">Unexpected Keyboard 设置</string>
+  <string name="pref_category_layout">布局</string>
+  <string name="pref_layout_title">改变键盘布局</string>
+  <string name="pref_layout_e_system">系统设置</string>
+  <string name="pref_accents_title">声调</string>
+  <string name="pref_accents_e_all_installed">显示所有安装的语言的声调符号</string>
+  <string name="pref_accents_e_selected">只显示选择的语言的声调符号</string>
+  <string name="pref_accents_e_none">隐藏声调符号</string>
+  <string name="pref_category_typing">输入</string>
+  <string name="pref_swipe_dist_title">滑动触发距离</string>
+  <string name="pref_swipe_dist_summary">输入按键四角的符号需要滑动的距离 (%s)</string>
+  <string name="pref_long_timeout_title">长按到开始重复输入的时间</string>
+  <string name="pref_long_interval_title">长按后每次重复输入的时间间隔</string>
+  <string name="pref_vibrate_title">振动</string>
+  <string name="pref_vibrate_summary">启用或者禁用按下按键时振动</string>
+  <string name="pref_precise_repeat_title">精确控制光标移速</string>
+  <string name="pref_precise_repeat_summary">按键重复按下速度由手指滑动的距离决定</string>
+  <string name="pref_category_style">样式</string>
+  <string name="pref_margin_bottom_title">键盘下边距</string>
+  <string name="pref_keyboard_height_title">键盘高度</string>
+  <string name="pref_horizontal_margin_title">键盘左右边距</string>
+  <string name="pref_character_size_title">字符大小</string>
+  <string name="pref_character_size_summary">按键上显示的字符的大小 (%.2fx)</string>
+  <string name="pref_theme">主题</string>
+  <string name="pref_theme_e_system">跟随系统设置</string>
+  <string name="pref_theme_e_dark">暗色</string>
+  <string name="pref_theme_e_light">亮色</string>
+  <string name="pref_theme_e_black">黑色</string>
+  <string name="pref_swipe_dist_e_very_short">非常短</string>
+  <string name="pref_swipe_dist_e_short">短</string>
+	<string name="pref_swipe_dist_e_default">中（默认）</string>
+	<string name="pref_swipe_dist_e_far">长</string>
+  <string name="pref_swipe_dist_e_very_far">非常长</string>
+  <string name="pref_key_horizontal_space">按键的左右边距</string>
+  <string name="pref_key_vertical_space">按键的上下边距</string>
+  <string name="key_action_next">下一项</string>
+  <string name="key_action_done">完成</string>
+  <string name="key_action_go">前往</string>
+  <string name="key_action_prev">前一项</string>
+  <string name="key_action_search">搜索</string>
+  <string name="key_action_send">发送</string>
+</resources>

res/values/arrays.xml

@@ -4,34 +4,68 @@
     <item>system</item>
     <item>azerty</item>
     <item>qwerty</item>
+    <item>qwerty_pt</item>
     <item>qwerty_es</item>
+    <item>qwerty_ko</item>
     <item>qwerty_lv</item>
+    <item>qwerty_no</item>
+    <item>qwerty_sv_se</item>
+    <item>qwerty_hu</item>
+    <item>qwerty_tr</item>
     <item>ru_jcuken</item>
     <item>qwertz</item>
+    <item>qwertz_hu</item>
     <item>bgph1</item>
     <item>dvorak</item>
+    <item>colemak</item>
+    <item>neo2</item>
+    <item>bone</item>
+    <item>jcuken_ua</item>
+    <item>bangla</item>
   </string-array>
   <string-array name="pref_layout_entries">
     <item>@string/pref_layout_e_system</item>
     <item>AZERTY</item>
     <item>QWERTY</item>
+    <item>QWERTY (Brasileiro)</item>
     <item>QWERTY (Español)</item>
+    <item>QWERTY (Korean)</item>
     <item>QWERTY (Latvian)</item>
+    <item>QWERTY (Norwegian)</item>
+    <item>QWERTY (Swedish)</item>
+    <item>QWERTY (Hungarian)</item>
+    <item>QWERTY (Türkçe)</item>
     <item>ЙЦУКЕН (Русский)</item>
     <item>QWERTZ</item>
+    <item>QWERTZ (Hungarian)</item>
     <item>Bulgarian (Phonetic Traditional)</item>
     <item>Dvorak</item>
+    <item>Colemak</item>
+    <item>Neo 2</item>
+    <item>Bone</item>
+    <item>ЙЦУКЕН (Українська)</item>
+    <item>বাংলা</item>
+  </string-array>
+  <string-array name="pref_programming_layout_values">
+    <item>none</item>
+    <item>qwerty</item>
+    <item>dvorak</item>
+    <item>colemak</item>
+  </string-array>
+  <string-array name="pref_programming_layout_entries">
+    <item>@string/pref_programming_layout_none</item>
+    <item>QWERTY</item>
+    <item>Dvorak</item>
+    <item>Colemak</item>
   </string-array>
   <string-array name="pref_accents_entries">
     <item>@string/pref_accents_e_all_installed</item>
     <item>@string/pref_accents_e_selected</item>
-    <item>@string/pref_accents_e_all</item>
     <item>@string/pref_accents_e_none</item>
   </string-array>
   <string-array name="pref_accents_values">
     <item>1</item>
     <item>2</item>
-    <item>3</item>
     <item>4</item>
   </string-array>
   <string-array name="pref_theme_entries">
@@ -39,12 +73,14 @@
     <item>@string/pref_theme_e_dark</item>
     <item>@string/pref_theme_e_light</item>
     <item>@string/pref_theme_e_black</item>
+    <item>@string/pref_theme_e_white</item>
   </string-array>
   <string-array name="pref_theme_values">
     <item>system</item>
     <item>dark</item>
     <item>light</item>
     <item>black</item>
+    <item>white</item>
   </string-array>
   <string-array name="pref_swipe_dist_entries">
     <item>@string/pref_swipe_dist_e_very_short</item>

res/values/attrs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <declare-styleable name="ExtraKeyCheckBoxPreference">
+    <attr name="index" format="integer"/>
+  </declare-styleable>
+</resources>

res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Unexpected Keyboard</string>
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
   <string name="settings_activity_label">Unexpected Keyboard Settings</string>
   <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Change keyboard layout</string>
@@ -8,22 +9,29 @@
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
   <string name="pref_accents_e_selected">Only show accents for the selected language</string>
-  <string name="pref_accents_e_all">Show all accents</string>
   <string name="pref_accents_e_none">Hide accents</string>
+  <string name="pref_autocapitalisation_title">Automatic capitalisation</string>
+  <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string>
+  <string name="pref_extra_keys_title">Add keys to the keyboard</string>
+  <string name="pref_programming_layout_title">Keyboard layout for programming</string>
+  <string name="pref_programming_layout_none">None</string>
   <string name="pref_category_typing">Typing</string>
   <string name="pref_swipe_dist_title">Swiping distance</string>
   <string name="pref_swipe_dist_summary">Distance of characters in the corners of the keys (%s)</string>
   <string name="pref_long_timeout_title">Key repeat timeout</string>
   <string name="pref_long_interval_title">Key repeat interval</string>
-  <string name="pref_category_vibrate">Vibration</string>
   <string name="pref_vibrate_title">Vibration</string>
   <string name="pref_vibrate_summary">Enable/disable vibration on keypress</string>
-  <string name="pref_vibrate_duration_title">Duration</string>
   <string name="pref_precise_repeat_title">Precise cursor movements</string>
   <string name="pref_precise_repeat_summary">Modulate key repeat speed by swiping more or less</string>
+  <string name="pref_lockable_keys_title">Deprecated: Lockable modifiers</string>
+  <string name="pref_lockable_keys_summary">This option will be removed</string>
+  <string name="pref_lock_double_tap_title">Double tap on shift for caps lock</string>
+  <string name="pref_lock_double_tap_summary">Instead of holding modifiers for a time</string>
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Margin bottom</string>
   <string name="pref_keyboard_height_title">Keyboard height</string>
+  <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string>
   <string name="pref_horizontal_margin_title">Horizontal margin</string>
   <string name="pref_character_size_title">Label size</string>
   <string name="pref_character_size_summary">Size of characters displayed on the keyboard (%.2fx)</string>
@@ -32,6 +40,7 @@
   <string name="pref_theme_e_dark">Dark</string>
   <string name="pref_theme_e_light">Light</string>
   <string name="pref_theme_e_black">Black</string>
+  <string name="pref_theme_e_white">White</string>
   <string name="pref_swipe_dist_e_very_short">Very short</string>
   <string name="pref_swipe_dist_e_short">Short</string>
   <string name="pref_swipe_dist_e_default">Normal</string>

res/values/themes.xml

@@ -20,10 +20,20 @@
     <attr name="emoji_color" type="color" format="color"/>
     <attr name="emoji_key_bg" type="color" format="color"/>
     <attr name="emoji_key_text" type="color" format="color"/>
+    <!-- System integration -->
+    <attr name="navigationBarColor" format="color"/>
+    <attr name="windowLightNavigationBar" format="boolean"/>
   </declare-styleable>
-  <style name="Dark">
-    <item name="android:isLightTheme">false</item>
+  <style name="BaseTheme">
     <item name="android:forceDarkAllowed">false</item>
+    <item name="navigationBarColor">?attr/colorKeyboard</item>
+    <item name="windowLightNavigationBar">?attr/android:isLightTheme</item>
+    <item name="keyBorderRadius">5dp</item>
+    <item name="emoji_key_bg" type="color">?attr/emoji_button_bg</item>
+    <item name="emoji_key_text" type="color">?attr/colorLabel</item>
+  </style>
+  <style name="Dark" parent="BaseTheme">
+    <item name="android:isLightTheme">false</item>
     <item name="colorKeyboard">#1b1b1b</item>
     <item name="colorKey">#333333</item>
     <item name="colorKeyActivated">#1b1b1b</item>
@@ -31,15 +41,11 @@
     <item name="colorLabelActivated">#3399ff</item>
     <item name="colorLabelLocked">#33cc33</item>
     <item name="colorSubLabel">#cccccc</item>
-    <item name="keyBorderRadius">5dp</item>
     <item name="emoji_button_bg" type="color">#202020</item>
     <item name="emoji_color" type="color">#ffffff</item>
-    <item name="emoji_key_bg" type="color">?attr/emoji_button_bg</item>
-    <item name="emoji_key_text" type="color">?attr/colorLabel</item>
   </style>
-  <style name="Light">
+  <style name="Light" parent="BaseTheme">
     <item name="android:isLightTheme">true</item>
-    <item name="android:forceDarkAllowed">false</item>
     <item name="colorKeyboard">#e3e3e3</item>
     <item name="colorKey">#cccccc</item>
     <item name="colorKeyActivated">#e3e3e3</item>
@@ -47,15 +53,11 @@
     <item name="colorLabelActivated">#0066cc</item>
     <item name="colorLabelLocked">#33cc33</item>
     <item name="colorSubLabel">#333333</item>
-    <item name="keyBorderRadius">5dp</item>
-    <item name="emoji_button_bg" type="color">#dedede</item>
-    <item name="emoji_color" type="color">#000000</item>
-    <item name="emoji_key_bg" type="color">?attr/emoji_button_bg</item>
-    <item name="emoji_key_text" type="color">?attr/colorLabel</item>
+    <item name="emoji_button_bg">#dedede</item>
+    <item name="emoji_color">#000000</item>
   </style>
-  <style name="Black">
+  <style name="Black" parent="BaseTheme">
     <item name="android:isLightTheme">false</item>
-    <item name="android:forceDarkAllowed">false</item>
     <item name="colorKeyboard">#000000</item>
     <item name="colorKey">#000000</item>
     <item name="colorKeyActivated">#333333</item>
@@ -64,9 +66,19 @@
     <item name="colorLabelLocked">#00ff26</item>
     <item name="colorSubLabel">#bbbbbb</item>
     <item name="keyBorderRadius">1dp</item>
-    <item name="emoji_button_bg" type="color">#000000</item>
-    <item name="emoji_color" type="color">#ffffff</item>
-    <item name="emoji_key_bg" type="color">?attr/emoji_button_bg</item>
-    <item name="emoji_key_text" type="color">?attr/colorLabel</item>
+    <item name="emoji_button_bg">#000000</item>
+    <item name="emoji_color">#ffffff</item>
+  </style>
+  <style name="White" parent="BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#ffffff</item>
+    <item name="colorKey">#ffffff</item>
+    <item name="colorKeyActivated">#cccccc</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#0066cc</item>
+    <item name="colorLabelLocked">#33cc33</item>
+    <item name="colorSubLabel">#333333</item>
+    <item name="emoji_button_bg">#ffffff</item>
+    <item name="emoji_color">#000000</item>
   </style>
 </resources>

res/values/values.xml

@@ -7,10 +7,10 @@
   <dimen name="key_vertical_interval">2dp</dimen>
   <dimen name="key_horizontal_interval">2dp</dimen>
   <dimen name="key_height">51dp</dimen>
-  <item name="label_text_size" type="integer" format="float">0.33</item>
-  <item name="sublabel_text_size" type="integer" format="float">0.22</item>
   <dimen name="emoji_type_button_height">56dp</dimen>
   <dimen name="emoji_grid_height">250dp</dimen>
   <dimen name="emoji_text_size">28dp</dimen>
   <dimen name="extra_horizontal_margin">0dp</dimen>
+  <bool name="debug_logs" product="debug">true</bool>
+  <bool name="debug_logs" product="default">false</bool>
 </resources>

res/xml/azerty.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="a" key1="esc" key2="1" key3="&amp;"/>
-    <key key0="z" key2="2" key4="~"/>
+    <key key0="a" key2="1" key4="esc"/>
+    <key key0="z" key2="2" key3="&amp;" key4="~"/>
     <key key0="e" key2="3" key3="&quot;" key4="\#"/>
     <key key0="r" key2="4" key3="'"/>
     <key key0="t" key2="5" key3="(" key4=")"/>
     <key key0="y" key2="6" key3="-" key4="|"/>
     <key key0="u" key2="7" key4="`"/>
     <key key0="i" key2="8" key3="_" key4="\\"/>
-    <key key0="o" key2="9"/>
-    <key key0="p" key2="0" key4="\@"/>
+    <key key0="o" key2="9" key3="\@" key4="f11_placeholder"/>
+    <key key0="p" key2="0" key3="f12_placeholder"/>
   </row>
   <row>
-    <key key0="q" key1="tab"/>
-    <key key0="s" key1="accent_ring" key3="ß"/>
+    <key key0="q" key2="tab"/>
+    <key key0="s" key3="loc ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f" key3="{" key4="}"/>
     <key key0="g" key3="[" key4="]"/>
     <key key0="h" key3="=" key4="+"/>
     <key key0="j" key1="accent_trema" key2="accent_circonflexe" key3="^"/>
-    <key key0="k" key2="€" key3="$" key4="£"/>
+    <key key0="k" key2="€" key3="$"/>
     <key key0="l" key2="%"/>
-    <key key0="m" key4="*"/>
+    <key key0="m" key3="*"/>
   </row>
   <row>
     <key width="2.0" key0="shift"/>
@@ -31,7 +31,7 @@
     <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
     <key key0="v" key3=";" key4="."/>
     <key key0="b" key3=":" key4="/"/>
-    <key key0="n" key1="accent_tilde" key2="§" key4="!"/>
+    <key key0="n" key1="loc accent_tilde" key2="§" key4="!"/>
     <key width="2.0" key0="backspace" key2="delete"/>
   </row>
 </keyboard>

res/xml/bangla.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="ঙ" key2="ং" key3="esc" key4="১"/>
+    <key key0="য" key2="য়" key3="¶" key4="২"/>
+    <key key0="ড" key2="ঢ" key3="π" key4="৩"/>
+    <key key0="প" key2="ফ" key3="√" key4="৪"/>
+    <key key0="ট" key2="ঠ" key3="^" key4="৫"/>
+    <key key0="চ" key2="ছ" key3="÷" key4="৬"/>
+    <key key0="জ" key2="ঝ" key3="×" key4="৭"/>
+    <key key0="হ" key2="ঞ" key3="=" key4="৮"/>
+    <key key0="গ" key2="ঘ" key3="+" key4="৯"/>
+    <key key0="ড়" key2="ঢ়" key3="-" key4="০"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="ৃ" key1="ৠ" key2="ঋ" key3="tab" key4="র্"/>
+    <key key0="ু" key1="ঊ" key2="উ" key3="~" key4="ূ"/>
+    <key key0="ি" key1="ঈ" key2="ই" key3="•" key4="ী"/>
+    <key key0="া" key1="ৄ" key2="আ" key3="°" key4="অ"/>
+    <key key0="্" key1="ৗ" key2="ঁ" key3="\\" key4="/"/>
+    <key key0="ব" key1="`" key2="ভ" key3="&lt;" key4="&gt;"/>
+    <key key0="ক" key1="|" key2="খ" key3="[" key4="]"/>
+    <key key0="ত" key1="ৎ" key2="থ" key3="{" key4="}"/>
+    <key key0="দ" key1="_" key2="ধ" key3="(" key4=")"/>
+  </row>
+  <row>
+    <key width="1.4" key0="shift"/>
+    <key shift="0.1" key0="্র" key2="্য" key3="\#" key4="*"/>
+    <key key0="ো" key1="ৌ" key2="ও" key3="ঔ" key4="\@"/>
+    <key key0="ে" key1="ৈ" key2="এ" key3="ঐ" key4="%"/>
+    <key key0="র" key1="ঃ" key2="ল" key3=":" key4="&amp;"/>
+    <key key0="ন" key1="৳" key2="ণ" key3=";" key4="."/>
+    <key key0="স" key1="&quot;" key2="ষ" key3="!" key4=","/>
+    <key key0="ম" key1="'" key2="শ" key3="\?" key4="।"/>
+    <key shift="0.1" width="1.4" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/bone.xml

@@ -0,0 +1,45 @@
+<?xml	version="1.0"	encoding="utf-8"?>
+<keyboard bottom_row="false">
+	<row>
+		<key key0="j"				key2="esc"				key4="…"/>
+		<key key0="d"				key2="°"				key4="_"/>
+		<key key0="u"				key2="§"				key4="["/>
+		<key key0="a"										key4="]"/>
+		<key key0="x"										key4="^"/>
+		<key key0="p"							key3="!"	key4="7"/>
+		<key key0="h"							key3="&lt;"	key4="8"/>
+		<key key0="l"	key1="ℓ"				key3="&gt;"	key4="9"/>
+		<key key0="m"	key1="≠"				key3="="		key4="f11_placeholder"/>
+		<key key0="w"							key3="&amp;"	key4="f12_placeholder"/>
+	</row>
+	<row>
+		<key key0="c"				key2="tab"											key4="\\"/>
+		<key key0="t"	key1="accent_circonflexe"	key2="accent_caron"					key4="/"/>
+		<key key0="i"	key1="accent_aigu"			key2="accent_grave"					key4="{"/>
+		<key key0="e"	key1="accent_cedille"		key2="accent_ogonek"				key4="}"/>
+		<key key0="o"	key1="accent_ring"			key2="accent_dot_above"				key4="*"/>
+		<key key0="b"								key2="accent_macron"	key3="\?"	key4="4"/>
+		<key key0="n"								key2="accent_tilde"		key3="("	key4="5"/>
+		<key key0="r"								key2="accent_trema"		key3=")"	key4="6"/>
+		<key key0="s"								key2="accent_slash"		key3="-"/>
+		<key key0="g"	key1="\@"											key3=":"/>
+	</row>
+	<row>
+		<key width="1.5" key0="shift" key4="\#"/>
+		<key key0="f"											key4="|"/>
+		<key key0="v"											key4="~"/>
+		<key key0="ß"											key4="`"/>
+		<key key0="y"							key3="%"		key4="1"/>
+		<key key0="z"	key1="&quot;" 			key3="+"		key4="2"/>
+		<key key0="q"	key1="&apos;" 			key3=","		key4="3"/>
+		<key key0="k"							key3="."/>
+		<key width="1.5" key0="backspace"	key1="delete"	key3=";"/>
+	</row>
+	<row height="0.95">
+		<key width="1.8" key0="ctrl"						key2="meta" 								key4="switch_numeric"/>
+		<key width="1.2" key0="fn"		key1="alt"			key2="change_method"	key3="switch_emoji" key4="config"/>
+		<key width="4.0" key0="space"	key1="switch_programming"					key2="0" 			edgekeys="true"/>
+		<key width="1.2" 				key1="up"			key2="right" 			key3="left" 		key4="down" edgekeys="true"/>
+		<key width="1.8" key0="enter"												key3="action"/>
+	</row>
+</keyboard>

res/xml/bottom_row.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <row height="0.95">
-  <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-  <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
-  <key width="4.0" key0="space"/>
+  <key width="1.8" key0="ctrl" key1="loc switch_greekmath" key2="meta" key4="switch_numeric"/>
+  <key width="1.2" key0="fn" key1="alt" key2="change_method" key3="switch_emoji" key4="config"/>
+  <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
   <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
   <key width="1.8" key0="enter" key2="action"/>
 </row>

res/xml/colemak.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key1="esc"                key2="loc accent_aigu"    key3="loc accent_tilde"   shift="0.5"/>
+    <key key0="w" key1="loc accent_grave"       key2=" ́"              key3="~"            />
+    <key key0="f" key1="`"                  key2="-"              key3="+" />
+    <key key0="p"                           key2="="              key3="%"/>
+    <key key0="g" key1="!"                  key2="/"              key3="\\"/>
+    <key key0="j" key1="loc accent_caron"       key2="loc accent_trema"            />
+    <key key0="l" key1="f11_placeholder"    key2="f12_placeholder"/>
+    <key key0="u" key1="loc accent_double_aigu" key2="loc accent_ring"    />
+    <key key0="y" key1="&quot;"             key2="'"/>
+
+  </row>
+  <row>
+    <key key0="a"                           key2="1" key4="tab"/>
+    <key key0="r" key1="\@"                 key2="2" />
+    <key key0="s" key1="\#"                 key2="3" key4="loc ß"/>
+    <key key0="t" key1="$"                  key2="4" key4="loc accent_ogonek" />
+    <key key0="d" key1="€"                  key2="5" key4="loc accent_dot_above"/>
+    <key key0="h" key1="&amp;"              key2="6" />
+    <key key0="n" key1="*"                  key2="7" />
+    <key key0="e" key1="loc accent_circonflexe" key2="8" key4="^"/>
+    <key key0="i" key1="_"                  key2="9" />
+    <key key0="o" key1="0" key3="loc accent_macron"/>
+
+  </row>
+  <row>
+    <key key0="shift" width="1.5" />
+    <key key0="z"         key1=","    key2="."/>
+    <key key0="x"         key1="&gt;" key2="&lt;"/>
+    <key key0="c"         key1="{"    key2="}" key3="loc accent_cedille"/>
+    <key key0="v"         key1="["    key2="]"/>
+    <key key0="b"         key1="("    key2=")"/>
+    <key key0="k"         key1=";"    key2=":"/>
+    <key key0="m"         key1="|"    key2="\?" />
+    <key key0="backspace" key1="delete" shift="0.25" width="1.25"/>
+
+  </row>
+</keyboard>

res/xml/dvorak.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="shift" width="1.5" key1="esc" key2="tab"/>
-    <key key0="p" key1="accent_ring" key2="." key3="&lt;"/>
-    <key key0="y" key1="accent_grave" key2="," key3="&gt;"/>
-    <key key0="f" key4="€"/>
+    <key key0="shift" width="1.5" key2="esc" key4="tab"/>
+    <key key0="p" key1="loc accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
+    <key key0="y" key1="loc accent_grave" key2="," key3="&gt;" key4="f12_placeholder"/>
+    <key key0="f" key4="loc €"/>
     <key key0="g" key2="\\" key3="|"/>
-    <key key0="c" key1="accent_trema" key2="accent_circonflexe" key3="{" key4="}"/>
+    <key key0="c" key1="loc accent_trema" key2="loc accent_circonflexe" key3="{" key4="}"/>
     <key key0="r" key3="[" key4="]"/>
-    <key key0="l" key2="=" key3="+" key4="£"/>
+    <key key0="l" key2="=" key3="+" key4="loc £"/>
     <key key0="backspace" key2="delete" width="1.5"/>
   </row>
   <row>
-    <key key0="a" key2="1" key3="!"/>
-    <key key0="o" key1="accent_macron" key2="2" key3="\@"/>
-    <key key0="e" key1="accent_caron" key2="3" key3="\#"/>
-    <key key0="u" key2="4" key3="$"/>
+    <key key0="a" key2="1" key4="!"/>
+    <key key0="o" key1="loc accent_macron" key2="2" key3="\@" key4="loc accent_ogonek"/>
+    <key key0="e" key1="loc accent_caron" key2="3" key3="\#" key4="loc accent_dot_above"/>
+    <key key0="u" key2="4" key3="$" key4="loc accent_double_aigu"/>
     <key key0="i" key2="5" key3="%"/>
     <key key0="d" key2="6" key3="^"/>
     <key key0="h" key2="7" key3="&amp;"/>
     <key key0="t" key2="8" key3="*"/>
     <key key0="n" key2="9" key3="(" key4=")"/>
-    <key key0="s" key2="0" key3="ß"/>
+    <key key0="s" key2="0" key3="loc ß"/>
   </row>
   <row>
-    <key key0="q" shift="0.5" key1="accent_tilde" key2="`" key3="~"/>
-    <key key0="j" key1="accent_aigu" key2="'" key3="&quot;"/>
+    <key key0="q" shift="0.5" key1="loc accent_tilde" key2="`" key3="~"/>
+    <key key0="j" key1="loc accent_aigu" key2="'" key3="&quot;"/>
     <key key0="k" key2=";" key3=":"/>
-    <key key0="x" key1="accent_cedille"/>
+    <key key0="x" key1="loc accent_cedille"/>
     <key key0="b"/>
     <key key0="m" key2="/" key3="\?"/>
     <key key0="w"/>

res/xml/greekmath.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard bottom_row="false" extra_keys="false">
+  <row>
+    <key key0="θ" key2="^"/>
+    <key key0="δ" key1="⌊" key2="∨" key3="↔" key4="⊂"/>
+    <key key0="ϛ" key1="⌋" key2="∧" key3="↑" key4="⊃"/>
+    <key key0="α" key1="⌈" key2="⊥" key3="↕" key4="∀"/>
+    <key key0="ξ" key1="⌉" key2="∡" key4="⊷"/>
+    <key key0="π" key1="∥" key3="≪" key4="7"/>
+    <key key0="ψ" key1="⌀" key2="⟨" key3="≡" key4="8"/>
+    <key key0="λ" key1="∞" key2="⟩" key3="≫" key4="9"/>
+    <key key0="μ" key1="∝" key3="□" key4="f11_placeholder"/>
+    <key key0="ω" key1="∅" key3="∘" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key key0="χ" key4="ℂ"/>
+    <key key0="τ" key3="←" key4="∂"/>
+    <key key0="ι" key3="↓" key4="∫"/>
+    <key key0="ε" key3="→" key4="∃"/>
+    <key key0="ο" key4="∈"/>
+    <key key0="β" key1="⊕" key4="4"/>
+    <key key0="ν" key1="⊖" key3="ℕ" key4="5"/>
+    <key key0="ρ" key1="⊙" key3="ℝ" key4="6"/>
+    <key key0="σ" key1="⊗"/>
+    <key key0="γ" key1="⌀"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="φ" key3="⇌" key4="√"/>
+    <key key0="η" key3="accent_arrow_right" key4="∪"/>
+    <key key0="ϡ" key4="∩"/>
+    <key key0="υ" key3="∇" key4="ℵ"/>
+    <key key0="ζ" key1="≤" key3="ℤ" key4="1"/>
+    <key key0="Ϟ" key1="≠" key3="ℚ" key4="2"/>
+    <key key0="κ" key1="≥" key3="×" key4="3"/>
+    <key width="1.5" key0="backspace" key3="delete"/>
+  </row>
+  <row height="0.95">
+    <key width="1.2" key0="switch_text" key2="esc"/>
+    <key width="1.2" key0="switch_numeric" key2="tab"/>
+    <key width="1.2" key0="fn"/>
+    <key width="2.8" key0="space" key1="superscript" key3="subscript"/>
+    <key width="1.2" key0="0" key2="."/>
+    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+    <key width="1.2" key0="enter" key1="=" key2="action"/>
+  </row>
+</keyboard>

res/xml/jcuken_ua.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key shift="0.1 " key0="й" key2="1" key4="esc"/>
+    <key key0="ц" key1="~" key2="2" key3="\@"/>
+    <key key0="у" key1="!" key2="3" key3="\#" key4="loc €"/>
+    <key key0="к" key2="4" key3="$"/>
+    <key key0="е" key2="5" key3="%"/>
+    <key key0="н" key2="6" key3="^"/>
+    <key key0="г" key1="ґ" key2="7" key3="&amp;"/>
+    <key key0="ш" key2="8" key3="*"/>
+    <key key0="щ" key2="9" key3="(" key4=")"/>
+    <key key0="з" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="х"/>
+  </row>
+  <row>
+    <key shift="0.1" key0="ф" key1="tab" key2="`"/>
+    <key key0="і" key2="ї"/>
+    <key key0="в" />
+    <key key0="а" />
+    <key key0="п" />
+    <key key0="р" />
+    <key key0="о" key2="-" key3="_"/>
+    <key key0="л" key2="=" key3="+"/>
+    <key key0="д" key4="}" key3="{"/>
+    <key key0="ж" key3="[" key4="]"/>
+    <key key0="є" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.1" key0="shift"/>
+    <key key0="я"/>
+    <key key0="ч" />
+    <key key0="с" />
+    <key key0="м" key2="&lt;" key3="."/>
+    <key key0="и" key2="&gt;" key3=","/>
+    <key key0="т" key2="\?" key3="/"/>
+    <key key0="ь" key2=":" key3=";"/>
+    <key key0="б" key2="&quot;" key3="'"/>
+    <key key0="ю" key1="«" key2="»"/>
+    <key width="1.1" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/local_bgph1.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="я" key1="esc" key2="1" key3="ч" key4="!"/>
-    <key key0="в" key2="2" key3="\@"/>
+    <key key0="я" key2="1" key4="esc"/>
+    <key key0="в" key1="!" key2="2" key3="\@" key4="ч"/>
     <key key0="е" key2="3" key3="\#" key4="№"/>
     <key key0="р" key2="4" key3="$"/>
     <key key0="т" key2="5" key3="%"/>
     <key key0="ъ" key2="6" key3="^" key4="€"/>
     <key key0="у" key2="7" key3="&amp;" key4="§"/>
     <key key0="и" key2="8" key3="*"/>
-    <key key0="о" key1="accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="п" key2="0" key3="ш" key4="щ"/>
+    <key key0="о" key2="9" key3="(" key4=")"/>
+    <key key0="п" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="а" key1="tab" key2="`"/>
-    <key key0="с" key2="£"/>
-    <key key0="д" key1="accent_grave" key3="accent_aigu"/>
+    <key key0="с"/>
+    <key key0="д"/>
     <key key0="ф"/>
-    <key key0="г" key1="accent_caron" key2="-" key3="_"/>
+    <key key0="г" key2="-" key3="_"/>
     <key key0="х" key2="=" key3="+"/>
-    <key key0="й" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
-    <key key0="к" key3="[" key4="]"/>
-    <key key0="л" key2="|" key3="\\" key4="ю"/>
+    <key key0="й" key4="}" key3="{"/>
+    <key key0="к" key2="ш" key3="[" key4="]"/>
+    <key key0="л" key1="щ" key2="|" key3="\\" key4="ю"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
     <key key0="з"/>
-    <key key0="ь" key1="accent_ring" key3="ѝ"/>
-    <key key0="ц" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="ь" key3="ѝ"/>
+    <key key0="ц" key2="&lt;" key3="."/>
     <key key0="ж" key2="&gt;" key3=","/>
     <key key0="б" key2="\?" key3="/"/>
-    <key key0="н" key1="accent_tilde" key2=":" key3=";"/>
+    <key key0="н" key2=":" key3=";"/>
     <key key0="м" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>

res/xml/local_ru_jcuken.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="й" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="ц" key2="2" key3="\@"/>
-    <key key0="у" key2="3" key3="\#"/>
+    <key key0="й" key2="1" key4="esc"/>
+    <key key0="ц" key2="2" key3="\@" key4="~"/>
+    <key key0="у" key2="3" key3="\#" key4="!"/>
     <key key0="к" key2="4" key3="$"/>
     <key key0="е" key1="ё" key2="5" key3="%"/>
     <key key0="н" key2="6" key3="^"/>
     <key key0="г" key2="7" key3="&amp;"/>
     <key key0="ш" key2="8" key3="*"/>
     <key key0="щ" key2="9" key3="(" key4=")"/>
-    <key key0="з" key2="0"/>
-    <key key0="х" key1="{" key2="}"/>
-    <key key0="ъ" key1="[" key2="]" />
+    <key key0="з" key2="0" key3="{" key4="}" />
+    <key key0="х" key3="[" key4="]" key1="f11_placeholder" key2="f12_placeholder"/>
+
   </row>
   <row>
-    <key shift="0.5" key0="ф" key1="tab" key2="`"/>
+    <key key0="ф" key1="tab" key2="`"/>
     <key key0="ы"/>
     <key key0="в"/>
     <key key0="а"/>
@@ -28,16 +28,16 @@
     <key key0="э" key2="|" key3="\\"/>
   </row>
   <row>
-    <key width="1.5" key0="shift"/>
-    <key key0="я"/>
-    <key key0="ч"/>
-    <key key0="с"/>
-    <key key0="м"/>
-    <key key0="и" key2="&lt;" key3="."/>
-    <key key0="т" key2="&gt;" key3=","/>
-    <key key0="ь" key2="\?" key3="/"/>
-    <key key0="б" key2=":" key3=";"/>
-    <key key0="ю" key2="&quot;" key3="'"/>
-    <key width="1.5" key0="backspace" key2="delete"/>
+    <key width="1.18" key0="shift"/>
+    <key width="0.96" key0="я"/>
+    <key width="0.96" key0="ч"/>
+    <key width="0.96" key0="с"/>
+    <key width="0.96" key0="м"/>
+    <key width="0.96" key0="и" key2="&lt;" key3="."/>
+    <key width="0.96" key0="т" key2="&gt;" key3=","/>
+    <key width="0.96" key0="ь" key1="ъ" key2="\?" key3="/"/>
+    <key width="0.96" key0="б" key2=":" key3=";"/>
+    <key width="0.96" key0="ю" key2="&quot;" key3="'"/>
+    <key width="1.18" key0="backspace" key2="delete"/>
   </row>
 </keyboard>

res/xml/method.xml

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="juloo.keyboard2.SettingsActivity" android:supportsSwitchingToNextInputMethod="true">
-  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=bgph1,extra_keys=euro"/>
-  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz,extra_keys=trema|szlig|euro"/>
-  <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=pound|euro"/>
+  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=bgph1,extra_keys=€"/>
+  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=৳"/>
+  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz,extra_keys=accent_trema|ß|€"/>
+  <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=£|€"/>
   <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/>
-  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_es,extra_keys=grave|aigu|tilde|trema|euro"/>
-  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=grave|aigu|circonflexe|cedille|trema|euro"/>
-  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=grave|aigu|euro"/>
-  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_lv,extra_keys=caron|cedille|macron|euro"/>
-  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=aigu|cedille|circonflexe|grave|tilde|euro"/>
+  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
+  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_grave|accent_aigu|€"/>
+  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_ko"/>
+  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_ogonek|accent_caron|accent_dot_above|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_no,extra_keys=accent_aigu|€"/>
+  <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_aigu|accent_ogonek|accent_dot_above|ł"/>
+  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_pt,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
   <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=ru_jcuken"/>
-  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=aigu|trema|ring|euro"/>
+  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_sv_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
+  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
+  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=jcuken_ua"/>
+  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_cs,extra_keys=a|accent_cedille|accent_circonflexe"/>
 </input-method>

res/xml/neo2.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard bottom_row="false">
+  <row>
+    <key key0="x" key1="°" key2="1" key4="…"/>
+    <key key0="v" key1="§" key2="2" key4="_"/>
+    <key key0="l" key2="3" key4="["/>
+    <key key0="c" key2="4" key4="]"/>
+    <key key0="w" key2="5" key4="^"/>
+    <key key0="k" key2="6" key4="!"/>
+    <key key0="h" key2="7" key4="&lt;"/>
+    <key key0="g" key2="8" key4="&gt;"/>
+    <key key0="f" key2="9" key3="f11_placeholder" key4="="/>
+    <key key0="q" key2="0" key3="f12_placeholder" key4="&amp;"/>
+    <key key0="ß" key1="-"/>
+  </row>
+  <row>
+    <key key0="u" key1="tab" key4="\\"/>
+    <key key0="i" key4="/"/>
+    <key key0="a" key4="{"/>
+    <key key0="e" key4="}"/>
+    <key key0="o" key4="*"/>
+    <key key0="s" key4="\?"/>
+    <key key0="n" key4="("/>
+    <key key0="r" key4=")"/>
+    <key key0="t" key4="-"/>
+    <key key0="d" key4=":"/>
+    <key key0="y" key3="\@"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key1="esc"/>
+    <key key0="ü" key4="\#"/>
+    <key key0="ö" key4="$"/>
+    <key key0="ä" key4="|"/>
+    <key key0="p" key4="~"/>
+    <key key0="z" key4="`"/>
+    <key key0="b" key4="+"/>
+    <key key0="m" key4="%"/>
+    <key key0="." key1="," key3="&quot;" key4="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+  <row height="0.95">
+	  <key width="1.8" key0="ctrl" key2="meta" key4="switch_numeric"/>
+	  <key width="1.2" key0="fn" key1="alt" key2="change_method" key3="switch_emoji" key4="config"/>
+	  <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
+	  <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+	  <key key0="j" key4=";"/>
+	  <key width="1.8" key0="enter" key2="action"/>
+	</row>
+</keyboard>

res/xml/numeric.xml

@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard bottom_row="false">
+<keyboard bottom_row="false" extra_keys="false">
   <row>
     <key width="0.75" key0="esc" key2="~" key4="!"/>
     <key width="0.75" key0="(" key2="[" key4="{"/>
-    <key key0="7" key3="&lt;" key4="&gt;"/>
+    <key key0="7" key1="&lt;" key2="&gt;"/>
     <key key0="8" key2="∞"/>
     <key key0="9" key2="π"/>
-    <key width="0.75" key0="*" key1="√" key2="×"/>
+    <key width="0.75" key0="*" key1="√" key2="×" key3="\#"/>
     <key width="0.75" key0="/" key1="%" key3="÷"/>
   </row>
   <row>
-    <key width="0.75" key0="tab" key1=";" key2="|" key4="\\"/>
+    <key width="0.75" key0="tab" key2="|" key4="\\"/>
     <key width="0.75" key0=")" key2="]" key4="}"/>
-    <key key0="4"/>
+    <key key0="4" key1="box" key3="arrows"/>
     <key key0="5" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
     <key key0="6"/>
     <key width="0.75" key0="+" key1="Σ" key2="$"/>
-    <key width="0.75" key0="-" key2="^"/>
+    <key width="0.75" key0="-" key1="^"/>
   </row>
   <row>
-    <key shift="0.35" width="1.15" key0="shift" key2="fn" key4="alt"/>
+    <key width="0.75" key0="switch_greekmath"/>
+    <key width="0.75" key0="shift" key2="fn" key4="alt"/>
     <key key0="1" key1="superscript" key2="ordinal" key3="subscript"/>
     <key key0="2"/>
     <key key0="3"/>
-    <key width="1.15" key0="backspace" key2="delete"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
   </row>
   <row height="0.95">
-    <key width="1.5" key0="ctrl" key3="switch_text"/>
-    <key width="1.5" key0="0"/>
-    <key width="0.75" key0="." key1=":" key2=","/>
+    <key width="1.5" key0="switch_text" key2="ctrl"/>
+    <key width="1.5" key0="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key width="0.75" key0="." key1=":" key2="," key3=";"/>
     <key width="0.75" key0="space" key1="&quot;" key2="'" key4="_"/>
     <key width="1.5" key0="enter" key1="±" key2="action" key3="="/>
   </row>

res/xml/qwerty.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
-    <key key0="e" key2="3" key3="\#" key4="€"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="r" key2="4" key3="$"/>
     <key key0="t" key2="5" key3="%"/>
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
-    <key key0="o" key1="accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0"/>
+    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`"/>
-    <key key0="s" key1="accent_ring" key3="ß"/>
-    <key key0="d" key1="accent_grave" key2="£" key3="accent_aigu"/>
-    <key key0="f"/>
-    <key key0="g" key1="accent_caron" key2="-" key3="_"/>
+    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
+    <key key0="f" key1="loc accent_dot_above"/>
+    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
     <key key0="h" key2="=" key3="+"/>
-    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
-    <key key0="k" key3="[" key4="]"/>
+    <key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
+    <key key0="k" key1="loc accent_double_aigu" key3="[" key4="]"/>
     <key key0="l" key2="|" key3="\\"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
     <key key0="z"/>
     <key key0="x"/>
-    <key key0="c" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
-    <key key0="n" key1="accent_tilde" key2=":" key3=";"/>
+    <key key0="n" key1="loc accent_tilde" key2=":" key3=";"/>
     <key key0="m" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>

res/xml/qwerty_es.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
-    <key key0="e" key2="3" key3="\#" key4="€"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$"/>
     <key key0="t" key2="5" key3="%"/>
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
     <key key0="o" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0"/>
+    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="a" key2="`" key3="tab" key4="¡"/>
-    <key key0="s" key1="accent_ring" key3="ß"/>
-    <key key0="d" key1="accent_grave" key2="£" key3="accent_aigu"/>
+    <key key0="a" key2="tab" key4="`"/>
+    <key key0="s" key2="¡" key3="loc ß"/>
+    <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f"/>
-    <key key0="g" key1="accent_caron" key2="-" key3="_"/>
+    <key key0="g" key2="-" key3="_"/>
     <key key0="h" key2="=" key3="+"/>
-    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
+    <key key0="j" key1="accent_trema" key4="}" key3="{"/>
     <key key0="k" key3="[" key4="]"/>
     <key key0="l" key2="|" key3="\\"/>
-    <key key0="ñ"/>
+    <key key0="ñ" key1="·" key3="ç" />
   </row>
   <row>
     <key width="1.5" key0="shift"/>
     <key key0="z"/>
     <key key0="x"/>
-    <key key0="c" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/" key4="¿"/>
     <key key0="n" key1="accent_tilde" key2=":" key3=";"/>

res/xml/qwerty_hu.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key2="0" key4="esc"/>
+    <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
+    <key key0="e" key1="&quot;" key2="2" key4="é"/>
+    <key key0="r" key2="3" key4="^"/>
+    <key key0="t" key1="!" key2="4" key4="f11_placeholder"/>
+    <key key0="y" key1="%" key2="5" key3="°" key4="f12_placeholder"/>
+    <key key0="u" key1="ű" key2="6" key3="ü" key4="ú"/>
+    <key key0="i" key1="=" key2="7" key3="`" key4="í"/>
+    <key key0="o" key1="ő" key2="8" key3="ö" key4="ó"/>
+    <key key0="p" key2="9"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key4="á"/>
+    <key key0="s" key1="§" key2="\\" key3="[" key4="]"/>
+    <key key0="d" key3="{" key4="}"/>
+    <key key0="f" key3="+"/>
+    <key key0="g" key3="*"/>
+    <key key0="h"/>
+    <key key0="j"/>
+    <key key0="k" key3="(" key4=")"/>
+    <key key0="l" key1="$" key3="/"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z" key3="&lt;" key4="&gt;"/>
+    <key key0="x" key4="\#"/>
+    <key key0="c" key4="&amp;"/>
+    <key key0="v" key4="\@"/>
+    <key key0="b" key1="\?" key3="," key4=";"/>
+    <key key0="n" key1=":" key3="."/>
+    <key key0="m" key1="_" key3="-"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwerty_ko.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="ㅂ" key2="1" key4="esc"/>
+    <key key0="ㅈ" key1="~" key2="2" key3="\@"/>
+    <key key0="ㄷ" key1="!" key2="3" key3="\#"/>
+    <key key0="ㄱ" key2="4" key3="$"/>
+    <key key0="ㅅ" key2="5" key3="%"/>
+    <key key0="ㅛ" key2="6" key3="^"/>
+    <key key0="ㅕ" key2="7" key3="&amp;"/>
+    <key key0="ㅑ" key2="8" key3="*"/>
+    <key key0="ㅐ" key2="9" key3="(" key4=")"/>
+    <key key0="ㅔ" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="ㅁ" key1="tab" key2="`"/>
+    <key key0="ㄴ"/>
+    <key key0="ㅇ"/>
+    <key key0="ㄹ"/>
+    <key key0="ㅎ" key2="-" key3="_"/>
+    <key key0="ㅗ" key2="=" key3="+"/>
+    <key key0="ㅓ" key4="}" key3="{"/>
+    <key key0="ㅏ" key3="[" key4="]"/>
+    <key key0="ㅣ" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="ㅋ"/>
+    <key key0="ㅌ"/>
+    <key key0="ㅊ" key2="&lt;" key3="."/>
+    <key key0="ㅍ" key2="&gt;" key3=","/>
+    <key key0="ㅠ" key2="\?" key3="/"/>
+    <key key0="ㅜ" key2=":" key3=";"/>
+    <key key0="ㅡ" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwerty_lv.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
     <key key0="e" key1="ē" key2="3" key3="\#" key4="€"/>
-    <key key0="r" key1="ŗ" key2="4" key3="$"/>
-    <key key0="t" key2="5" key3="%"/>
+    <key key0="r" key1="ŗ" key2="4" key3="$" key4="f11_placeholder"/>
+    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
     <key key0="y" key2="6" key3="^"/>
-    <key key0="u" key1="ū" key2="7" key3="&amp;"/>
-    <key key0="i" key1="ī" key2="8" key3="*"/>
-    <key key0="o" key1="ō" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="{" key4="}"/>
+    <key key0="u" key1="ū" key2="7" key3="&amp;" key4="*"/>
+    <key key0="i" key1="ī" key2="8" key3="(" key4=")"/>
+    <key key0="o" key1="ō" key2="9" key3="{" key4="}"/>
+    <key key0="p" key2="0"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="ā"/>
-    <key key0="s" key1="š" key3="ß"/>
-    <key key0="d" key2="£"/>
-    <key key0="f"/>
+    <key shift="0.5" key0="a" key1="ā" key2="tab"/>
+    <key key0="s" key1="š" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="d"/>
+    <key key0="f" key1="loc accent_dot_above"/>
     <key key0="g" key1="ģ"/>
     <key key0="h" key2="accent_macron" key3="accent_caron" key4="accent_cedille"/>
     <key key0="j" key1="+" key2="=" key3="-" key4="_"/>
@@ -24,7 +24,7 @@
     <key key0="l" key1="ļ" key2="|" key3="/" key4="\\"/>
   </row>
   <row>
-    <key width="1.5" key0="shift" key1="tab"/>
+    <key width="1.5" key0="shift"/>
     <key key0="z" key1="ž"/>
     <key key0="x"/>
     <key key0="c" key1="č"/>

res/xml/qwerty_no.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
+    <key key0="y" key2="6" key3="^"/>
+    <key key0="u" key2="7" key3="&amp;"/>
+    <key key0="i" key2="8" key3="*"/>
+    <key key0="o" key1="ø" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="`" key3="æ" key4="å"/>
+    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
+    <key key0="f" key1="loc accent_dot_above"/>
+    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
+    <key key0="h" key2="=" key3="+"/>
+    <key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
+    <key key0="k" key1="loc accent_double_aigu" key3="[" key4="]"/>
+    <key key0="l" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z"/>
+    <key key0="x"/>
+    <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
+    <key key0="v" key2="&gt;" key3=","/>
+    <key key0="b" key2="\?" key3="/"/>
+    <key key0="n" key1="loc accent_tilde" key2=":" key3=";"/>
+    <key key0="m" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwerty_pt.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
+    <key key0="e" key2="3" key3="\#" key4="€"/>
+    <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
+    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="y" key2="6" key3="^" key4="loc accent_trema"/>
+    <key key0="u" key2="7" key3="&amp;"/>
+    <key key0="i" key2="8" key3="*"/>
+    <key key0="o" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0" key3="\\"/>
+  </row>
+  <row>
+    <key key0="a" key2="tab" key4="`"/>
+    <key key0="s" key1="'" key3="loc ß" key4="accent_cedille"/>
+    <key key0="d" key1="&quot;"/>
+    <key key0="f"/>
+    <key key0="g"/>
+    <key key0="h"/>
+    <key key0="j" key1="-" key2="=" key4="+" key3="_"/>
+    <key key0="k" key1="accent_grave" key2="accent_aigu" key3="accent_tilde" key4="accent_circonflexe"/>
+    <key key0="l" key1="[" key2="]" key3="{" key4="}"/>
+    <key key0="ç" key1="|"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z"/>
+    <key key0="x"/>
+    <key key0="c"/>
+    <key key0="v"/>
+    <key key0="b"/>
+    <key key0="n" key1="&lt;" key2="&gt;" key3="," key4="."/>
+    <key key0="m" key1=":" key2=";" key3="/" key4="\?"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwerty_sv_se.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key4="esc" key2="1"/>
+    <key key0="w" key2="2" key3="`" key4="\@"/>
+    <key key0="e" key2="3" key4="\#" key3="€"/>
+    <key key0="r" key2="4" key4="$"/>
+    <key key0="t" key2="5" key3="&amp;" key4="|"/>
+    <key key0="y" key2="6" key3="^" key4="%"/>
+    <key key0="u" key2="7" key3="~" key4="\\"/>
+    <key key0="i" key2="8" key3="*" key4="/"/>
+    <key key0="o" key2="9" key3="+" key4="-"/>
+    <key key0="p" key2="0" key3="=" key4="f11_placeholder"/>
+    <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key key0="a" key2="tab"/>
+    <key key0="s" key1="accent_ring" key3="loc ß"/>
+    <key key0="d" key3="accent_aigu"/>
+    <key key0="f" key1="accent_trema"/>
+    <key key0="g"/>
+    <key key0="h"/>
+    <key key0="j" key1="{" key4="}"/>
+    <key key0="k" key1="[" key4="]"/>
+    <key key0="l" key1="(" key4=")"/>
+    <key key0="ö" key1="&lt;" key4="&gt;"/>
+    <key key0="ä" key1="'" key3="&quot;"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z"/>
+    <key key0="x"/>
+    <key key0="c"/>
+    <key key0="v"/>
+    <key key0="b" key2=";" key4=","/>
+    <key key0="n" key2=":" key4="."/>
+    <key key0="m" key2="-" key4="_"/>
+    <key width="1.0" key0="." key1="!" key2="\?" key3="'" key4=","/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwerty_tr.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%" key4="₺"/>
+    <key key0="y" key2="6" key3="^"/>
+    <key key0="u" key1="ü" key2="7" key3="&amp;"/>
+    <key key0="i" key1="ı" key2="8" key3="*"/>
+    <key key0="o" key1="ö" key2="9" key3="(" key4=")"/>
+    <key key0="p" key1="0" />
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="`"/>
+    <key key0="s" key1="ş"/>
+    <key key0="d"/>
+    <key key0="f"/>
+    <key key0="g" key1="ğ" key2="-" key3="_"/>
+    <key key0="h" key2="=" key3="+"/>
+    <key key0="j" key3="{" key4="}"/>
+    <key key0="k" key3="[" key4="]"/>
+    <key key0="l" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z"/>
+    <key key0="x"/>
+    <key key0="c" key1="ç" key2="&lt;" key3="."/>
+    <key key0="v" key2="&gt;" key3=","/>
+    <key key0="b" key2="\?" key3="/"/>
+    <key key0="n" key2=":" key3=";"/>
+    <key key0="m" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwertz.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="\@" key4="!"/>
-    <key key0="w" key1="^" key2="2" key3="&quot;"/>
-    <key key0="e" key1="§" key2="3" key4="€"/>
-    <key key0="r" key2="4" key3="$"/>
-    <key key0="t" key2="5" key3="%"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
+    <key key0="e" key1="§" key2="3" key3="!" key4="€"/>
+    <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
+    <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
     <key key0="z" key2="6" key3="&amp;" key4="{"/>
     <key key0="u" key2="7" key3="ü" key4="}"/>
-    <key key0="i" key1="(" key2="8" key4="["/>
-    <key key0="o" key1=")" key2="9" key3="ö" key4="]"/>
-    <key key0="p" key1="=" key2="0" key3="\?"/>
+    <key key0="i" key1="(" key2="8" key3="[" key4="]"/>
+    <key key0="o" key1=")" key2="9" key3="ö" key4="="/>
+    <key key0="p" key2="0" key3="\?"/>
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`" key3="ä"/>
     <key key0="s" key3="ß"/>
-    <key key0="d" key2="£"/>
+    <key key0="d"/>
     <key key0="f" key1="~"/>
     <key key0="g" key3="-"/>
     <key key0="h" key3="+"/>

res/xml/qwertz_cs.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key1="1" key4="esc"/>
+    <key key0="w" key1="2" key3="~"/>
+    <key key0="e" key1="3" key2="é" key3="ë" key4="ě"/>
+    <key key0="r" key1="4" key2="ŕ" key3="°" key4="ř"/>
+    <key key0="t" key1="5" key3="%" key4="ť"/>
+    <key key0="z" key1="6" key3="^" key4="ž"/>
+    <key key0="u" key1="7" key2="ú" key3="ü" key4="ů"/>
+    <key key0="i" key1="8" key2="í" key3="ï" key4="*"/>
+    <key key0="o" key1="9" key2="ó" key3="ö" key4="ô"/>
+    <key key0="p" key1="0" key2="=" key3="/" key4="π"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="á" key3="ä" key4="α"/>
+    <key key0="s" key1="{" key2="&lt;" key3="§" key4="š"/>
+    <key key0="d" key1="$" key2="δ" key3="Δ" key4="ď"/>
+    <key key0="f" key1="&gt;" key2="}" key3="ѳ" key4="φ"/>
+    <key key0="g" key1="»" key2="«" key3="–" key4="_"/>
+    <key key0="h" key1="[" key2="("/>
+    <key key0="j" key1="+" key2="\?" key3="!" key4="-"/>
+    <key key0="k" key1=")" key2="]"/>
+    <key key0="l" key2="ľ" key3="\\" key4="ĺ"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="y" key1="÷" key2="ý"/>
+    <key key0="x" key1="∙" key3="×"/>
+    <key key0="c" key1="\#" key2="γ" key3="&amp;" key4="č"/>
+    <key key0="v" key1="|" key3="\@"/>
+    <key key0="b" key1=";" key2="♭" key3=":" key4="β"/>
+    <key key0="n" key1="," key3="." key4="ň"/>
+    <key key0="m" key1="&quot;" key3="\'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwertz_hu.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key2="0" key4="esc"/>
+    <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
+    <key key0="e" key1="&quot;" key2="2" key4="é"/>
+    <key key0="r" key2="3" key4="^"/>
+    <key key0="t" key1="!" key2="4" key4="f11_placeholder"/>
+    <key key0="z" key1="%" key2="5" key3="°" key4="f12_placeholder"/>
+    <key key0="u" key1="ű" key2="6" key3="ü" key4="ú"/>
+    <key key0="i" key1="=" key2="7" key3="`" key4="í"/>
+    <key key0="o" key1="ő" key2="8" key3="ö" key4="ó"/>
+    <key key0="p" key2="9"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key4="á"/>
+    <key key0="s" key1="§" key2="\\" key3="[" key4="]"/>
+    <key key0="d" key3="{" key4="}"/>
+    <key key0="f" key3="+"/>
+    <key key0="g" key3="*"/>
+    <key key0="h"/>
+    <key key0="j"/>
+    <key key0="k" key3="(" key4=")"/>
+    <key key0="l" key1="$" key3="/"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="y" key3="&lt;" key4="&gt;"/>
+    <key key0="x" key4="\#"/>
+    <key key0="c" key4="&amp;"/>
+    <key key0="v" key4="\@"/>
+    <key key0="b" key1="\?" key3="," key4=";"/>
+    <key key0="n" key1=":" key3="."/>
+    <key key0="m" key1="_" key3="-"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
+

res/xml/settings.xml

@@ -1,23 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
   <PreferenceCategory android:title="@string/pref_category_layout">
     <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/>
     <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
+    <ListPreference android:key="programming_layout" android:title="@string/pref_programming_layout_title" android:summary="%s" android:defaultValue="none" android:entries="@array/pref_programming_layout_entries" android:entryValues="@array/pref_programming_layout_values"/>
+    <PreferenceScreen android:title="@string/pref_extra_keys_title">
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="1"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="2"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="3"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="4"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="5"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="6"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="7"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="8"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="9"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="10"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="11"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="12"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="13"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="14"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="15"/>
+    </PreferenceScreen>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_typing">
+    <CheckBoxPreference android:key="autocapitalisation" android:title="@string/pref_autocapitalisation_title" android:summary="@string/pref_autocapitalisation_summary" android:defaultValue="true"/>
     <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
     <juloo.common.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="%sms" android:defaultValue="600" min="50" max="2000"/>
     <juloo.common.IntSlideBarPreference android:key="longpress_interval" android:title="@string/pref_long_interval_title" android:summary="%sms" android:defaultValue="25" min="5" max="100"/>
     <CheckBoxPreference android:key="precise_repeat" android:title="@string/pref_precise_repeat_title" android:summary="@string/pref_precise_repeat_summary" android:defaultValue="true"/>
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/pref_category_vibrate">
+    <CheckBoxPreference android:key="lock_double_tap" android:title="@string/pref_lock_double_tap_title" android:summary="@string/pref_lock_double_tap_summary" android:defaultValue="false"/>
+    <PreferenceScreen android:title="@string/pref_lockable_keys_title" android:summary="@string/pref_lockable_keys_summary">
+      <CheckBoxPreference android:key="lockable_ctrl" android:title="Ctrl" android:defaultValue="false"/>
+      <CheckBoxPreference android:key="lockable_alt" android:title="Alt" android:defaultValue="false"/>
+      <CheckBoxPreference android:key="lockable_fn" android:title="Fn" android:defaultValue="false"/>
+      <CheckBoxPreference android:key="lockable_meta" android:title="Meta" android:defaultValue="false"/>
+      <CheckBoxPreference android:key="lockable_sup" android:title="Sup" android:defaultValue="false"/>
+      <CheckBoxPreference android:key="lockable_sub" android:title="Sub" android:defaultValue="false"/>
+      <CheckBoxPreference android:key="lockable_box" android:title="Box" android:defaultValue="false"/>
+    </PreferenceScreen>
     <CheckBoxPreference android:key="vibrate_enabled" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="true"/>
-    <juloo.common.IntSlideBarPreference android:key="vibrate_duration" android:title="@string/pref_vibrate_duration_title" android:summary="%sms" android:defaultValue="20" min="5" max="50"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/pref_category_style">
     <ListPreference android:key="theme" android:title="@string/pref_theme" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_theme_entries" android:entryValues="@array/pref_theme_values"/>
     <juloo.common.IntSlideBarPreference android:key="margin_bottom" android:title="@string/pref_margin_bottom_title" android:summary="%sdp" android:defaultValue="5" min="0" max="100"/>
     <juloo.common.IntSlideBarPreference android:key="keyboard_height" android:title="@string/pref_keyboard_height_title" android:summary="%s%%" android:defaultValue="35" min="25" max="50"/>
+    <juloo.common.IntSlideBarPreference android:key="keyboard_height_landscape" android:title="@string/pref_keyboard_height_landscape_title" android:summary="%s%%" android:defaultValue="50" min="35" max="65"/>
     <juloo.common.IntSlideBarPreference android:key="horizontal_margin" android:title="@string/pref_horizontal_margin_title" android:summary="%sdp" android:defaultValue="3" min="0" max="20"/>
     <juloo.common.SlideBarPreference android:key="character_size" android:title="@string/pref_character_size_title" android:summary="@string/pref_character_size_summary" android:defaultValue="1.0" min="0.8" max="1.2"/>
     <juloo.common.IntSlideBarPreference android:key="key_vertical_space" android:title="@string/pref_key_vertical_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>

shell.nix

@@ -14,6 +14,6 @@ let
 
 in
 pkgs.mkShell {
-  buildInputs = [ pkgs.findutils jdk android.androidsdk ];
+  buildInputs = [ pkgs.findutils jdk android.androidsdk pkgs.fontforge ];
   ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
 }

srcs/juloo.common/IntSlideBarPreference.java

@@ -95,6 +95,10 @@ public class IntSlideBarPreference extends DialogPreference
   {
     if (positiveResult)
       persistInt(_seekBar.getProgress() + _min);
+    else
+      _seekBar.setProgress(getPersistedInt(_min) - _min);
+
+    updateText();
   }
 
   protected View onCreateDialogView()

srcs/juloo.common/SlideBarPreference.java

@@ -99,6 +99,10 @@ public class SlideBarPreference extends DialogPreference
   {
     if (positiveResult)
       persistFloat(_value);
+    else
+      _seekBar.setProgress((int)((getPersistedFloat(_min) - _min) * STEPS / (_max - _min)));
+
+    updateText();
   }
 
   protected View onCreateDialogView()

srcs/juloo.keyboard2/Autocapitalisation.java

@@ -0,0 +1,138 @@
+package juloo.keyboard2;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.KeyEvent;
+
+final class Autocapitalisation
+{
+  boolean _enabled = false;
+  boolean _should_enable_shift = false;
+  boolean _should_disable_shift = false;
+  boolean _should_update_caps_mode = false;
+
+  Handler _handler;
+  InputConnection _ic;
+  Callback _callback;
+  int _caps_mode;
+
+  /** Keep track of the cursor to recognize cursor movements from typing. */
+  int _cursor;
+
+  static int SUPPORTED_CAPS_MODES =
+    InputType.TYPE_TEXT_FLAG_CAP_SENTENCES |
+    InputType.TYPE_TEXT_FLAG_CAP_WORDS;
+
+  Runnable delayed_callback = new Runnable()
+  {
+    public void run()
+    {
+      if (_should_update_caps_mode)
+      {
+        _should_enable_shift = _enabled && (_ic.getCursorCapsMode(_caps_mode) != 0);
+        _should_update_caps_mode = false;
+      }
+      _callback.update_shift_state(_should_enable_shift, _should_disable_shift);
+    }
+  };
+
+  void callback(final boolean might_disable)
+  {
+    _should_disable_shift = might_disable;
+    // The callback must be delayed because [getCursorCapsMode] would sometimes
+    // be called before the editor finished handling the previous event.
+    _handler.postDelayed(delayed_callback, 1);
+  }
+
+  /**
+   * The events are: started, typed, event sent, selection updated
+   * [started] does initialisation work and must be called before any other
+   * event.
+   */
+  public void started(Looper looper, Callback cb, EditorInfo info, InputConnection ic)
+  {
+    _handler = new Handler(looper);
+    _ic = ic;
+    _callback = cb;
+    _caps_mode = info.inputType & TextUtils.CAP_MODE_SENTENCES;
+    if (!Config.globalConfig().autocapitalisation || _caps_mode == 0)
+    {
+      _enabled = false;
+      return;
+    }
+    _enabled = true;
+    _should_enable_shift = (info.initialCapsMode != 0);
+    _callback.update_shift_state(_should_enable_shift, true);
+  }
+
+  public void typed(CharSequence c)
+  {
+    for (int i = 0; i < c.length(); i++)
+      type_one_char(c.charAt(i));
+    callback(false);
+  }
+
+  public void typed(char c)
+  {
+    type_one_char(c);
+    callback(false);
+  }
+
+  void type_one_char(char c)
+  {
+    _cursor++;
+    if (is_trigger_character(c))
+      _should_update_caps_mode = true;
+    else
+      _should_enable_shift = false;
+  }
+
+  public void event_sent(int code)
+  {
+    switch (code)
+    {
+      case KeyEvent.KEYCODE_DEL:
+        if (_cursor > 0) _cursor--;
+        _should_update_caps_mode = true;
+        break;
+    }
+    callback(true);
+  }
+
+  /** Returns [true] if shift might be disabled. */
+  public void selection_updated(int old_cursor, int new_cursor)
+  {
+    if (new_cursor == _cursor) // Just typing
+      return;
+    if (new_cursor == 0)
+    {
+      // Detect whether the input box has been cleared
+      CharSequence t = _ic.getTextAfterCursor(1, 0);
+      if (t != null && t.equals(""))
+        _should_update_caps_mode = true;
+    }
+    _cursor = new_cursor;
+    _should_enable_shift = false;
+    callback(true);
+  }
+
+  boolean is_trigger_character(char c)
+  {
+    switch (c)
+    {
+      case ' ':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  public static interface Callback
+  {
+    public void update_shift_state(boolean should_enable, boolean should_disable);
+  }
+}

srcs/juloo.keyboard2/Config.java

@@ -8,6 +8,10 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
+import android.view.KeyEvent;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.HashSet;
 
 final class Config
 {
@@ -20,10 +24,9 @@ final class Config
 
   // From preferences
   public int layout; // Or '-1' for the system defaults
-  private float swipe_dist_dp;
+  public int programming_layout; // Or '-1' for none
   public float swipe_dist_px;
   public boolean vibrateEnabled;
-  public long vibrateDuration;
   public long longPressTimeout;
   public long longPressInterval;
   public float marginBottom;
@@ -32,16 +35,20 @@ final class Config
   public float keyVerticalInterval;
   public float keyHorizontalInterval;
   public boolean preciseRepeat;
+  public Set<KeyValue.Modifier> lockable_modifiers = new HashSet<KeyValue.Modifier>();
   public float characterSize; // Ratio
   public int accents; // Values are R.values.pref_accents_v_*
   public int theme; // Values are R.style.*
+  public boolean autocapitalisation;
 
   // Dynamically set
   public boolean shouldOfferSwitchingToNextInputMethod;
-  public int key_flags_to_remove;
+  public boolean shouldOfferSwitchingToProgramming;
   public String actionLabel; // Might be 'null'
   public int actionId; // Meaningful only when 'actionLabel' isn't 'null'
   public boolean swapEnterActionKey; // Swap the "enter" and "action" keys
+  public Set<KeyValue> extra_keys_subtype;
+  public Set<KeyValue> extra_keys_param;
 
   public final IKeyEventHandler handler;
 
@@ -51,12 +58,12 @@ final class Config
     // static values
     marginTop = res.getDimension(R.dimen.margin_top);
     keyPadding = res.getDimension(R.dimen.key_padding);
-    labelTextSize = res.getFloat(R.integer.label_text_size);
-    sublabelTextSize = res.getFloat(R.integer.sublabel_text_size);
+    labelTextSize = 0.33f;
+    sublabelTextSize = 0.22f;
     // default values
     layout = -1;
+    programming_layout = -1;
     vibrateEnabled = true;
-    vibrateDuration = 20;
     longPressTimeout = 600;
     longPressInterval = 65;
     marginBottom = res.getDimension(R.dimen.margin_bottom);
@@ -71,10 +78,11 @@ final class Config
     refresh(context);
     // initialized later
     shouldOfferSwitchingToNextInputMethod = false;
-    key_flags_to_remove = 0;
+    shouldOfferSwitchingToProgramming = false;
     actionLabel = null;
     actionId = 0;
     swapEnterActionKey = false;
+    extra_keys_subtype = null;
     handler = h;
   }
 
@@ -86,36 +94,121 @@ final class Config
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
     Resources res = context.getResources();
     DisplayMetrics dm = res.getDisplayMetrics();
-    // The height of the keyboard is relative to the height of the screen. This
-    // is not the actual size of the keyboard, which will be bigger if the
-    // layout has a fifth row. 
+    // The height of the keyboard is relative to the height of the screen.
+    // This is the height of the keyboard if it have 4 rows.
     int keyboardHeightPercent;
+    // Scale some dimensions depending on orientation
+    float horizontalIntervalScale = 1.f;
+    float characterSizeScale = 1.f;
     if (res.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) // Landscape mode
     {
-      keyboardHeightPercent = 55;
+      keyboardHeightPercent = prefs.getInt("keyboard_height_landscape", 50);
+      horizontalIntervalScale = 2.f;
+      characterSizeScale = 1.25f;
     }
     else
     {
       keyboardHeightPercent = prefs.getInt("keyboard_height", 35);
     }
-    layout = layoutId_of_string(prefs.getString("layout", "system"));
-    swipe_dist_dp = Float.valueOf(prefs.getString("swipe_dist", "15"));
-    swipe_dist_px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, swipe_dist_dp, dm);
+    String layout_s = prefs.getString("layout", "system");
+    layout = layout_s.equals("system") ? -1 : layoutId_of_string(layout_s);
+    String prog_layout_s = prefs.getString("programming_layout", "none");
+    programming_layout = prog_layout_s.equals("none") ? -1 : layoutId_of_string(prog_layout_s);
+    // The swipe distance is defined relatively to the "exact physical pixels
+    // per inch of the screen", which isn't affected by the scaling settings.
+    // Take the mean of both dimensions as an approximation of the diagonal.
+    float physical_scaling = (dm.widthPixels + dm.heightPixels) / (dm.xdpi + dm.ydpi);
+    swipe_dist_px = Float.valueOf(prefs.getString("swipe_dist", "15")) * physical_scaling;;
     vibrateEnabled = prefs.getBoolean("vibrate_enabled", vibrateEnabled);
-    vibrateDuration = prefs.getInt("vibrate_duration", (int)vibrateDuration);
     longPressTimeout = prefs.getInt("longpress_timeout", (int)longPressTimeout);
     longPressInterval = prefs.getInt("longpress_interval", (int)longPressInterval);
     marginBottom = getDipPref(dm, prefs, "margin_bottom", marginBottom);
     keyVerticalInterval = getDipPref(dm, prefs, "key_vertical_space", keyVerticalInterval);
-    keyHorizontalInterval = getDipPref(dm, prefs, "key_horizontal_space", keyHorizontalInterval);
+    keyHorizontalInterval =
+      getDipPref(dm, prefs, "key_horizontal_space", keyHorizontalInterval)
+      * horizontalIntervalScale;
     // Do not substract keyVerticalInterval from keyHeight because this is done
     // during rendered.
     keyHeight = dm.heightPixels * keyboardHeightPercent / 100 / 4;
-    horizontalMargin = getDipPref(dm, prefs, "horizontal_margin", horizontalMargin) + res.getDimension(R.dimen.extra_horizontal_margin);
+    horizontalMargin =
+      getDipPref(dm, prefs, "horizontal_margin", horizontalMargin)
+      + res.getDimension(R.dimen.extra_horizontal_margin);
     preciseRepeat = prefs.getBoolean("precise_repeat", preciseRepeat);
-    characterSize = prefs.getFloat("character_size", characterSize);
+    lockable_modifiers.clear();
+    if (prefs.getBoolean("lock_double_tap", false))
+      lockable_modifiers.add(KeyValue.Modifier.SHIFT);
+    if (prefs.getBoolean("lockable_ctrl", false)) lockable_modifiers.add(KeyValue.Modifier.CTRL);
+    if (prefs.getBoolean("lockable_alt", false)) lockable_modifiers.add(KeyValue.Modifier.ALT);
+    if (prefs.getBoolean("lockable_fn", false)) lockable_modifiers.add(KeyValue.Modifier.FN);
+    if (prefs.getBoolean("lockable_meta", false)) lockable_modifiers.add(KeyValue.Modifier.META);
+    if (prefs.getBoolean("lockable_sup", false)) lockable_modifiers.add(KeyValue.Modifier.SUPERSCRIPT);
+    if (prefs.getBoolean("lockable_sub", false)) lockable_modifiers.add(KeyValue.Modifier.SUBSCRIPT);
+    if (prefs.getBoolean("lockable_box", false)) lockable_modifiers.add(KeyValue.Modifier.BOX);
+    characterSize =
+      prefs.getFloat("character_size", characterSize)
+      * characterSizeScale;
     accents = Integer.valueOf(prefs.getString("accents", "1"));
     theme = getThemeId(res, prefs.getString("theme", ""));
+    autocapitalisation = prefs.getBoolean("autocapitalisation", true);
+    extra_keys_param = ExtraKeyCheckBoxPreference.get_extra_keys(prefs);
+  }
+
+  /** Update the layout according to the configuration.
+   *  - Remove the switching key if it isn't needed
+   *  - Remove "localized" keys from other locales (not in 'extra_keys')
+   *  - Replace the action key to show the right label
+   *  - Swap the enter and action keys
+   */
+  public KeyboardData modify_layout(KeyboardData original_kw)
+  {
+    // Update the name to avoid caching in KeyModifier
+    final KeyValue action_key = (actionLabel == null) ? null :
+      KeyValue.getKeyByName("action").withSymbol(actionLabel);
+    // Extra keys are removed from the set as they are encountered during the
+    // first iteration then automatically added.
+    final Set<KeyValue> extra_keys = new HashSet<KeyValue>();
+    extra_keys.addAll(extra_keys_subtype);
+    extra_keys.addAll(extra_keys_param);
+    KeyboardData kw = original_kw.mapKeys(new KeyboardData.MapKeyValues() {
+      public KeyValue apply(KeyValue key, boolean localized)
+      {
+        boolean is_extra_key = extra_keys.contains(key);
+        if (is_extra_key)
+          extra_keys.remove(key);
+        if (localized && !is_extra_key)
+          return null;
+        switch (key.getKind())
+        {
+          case Event:
+            switch (key.getEvent())
+            {
+              case CHANGE_METHOD:
+                return shouldOfferSwitchingToNextInputMethod ? key : null;
+              case ACTION:
+                return (swapEnterActionKey && action_key != null) ?
+                  KeyValue.getKeyByName("enter") : action_key;
+              case SWITCH_PROGRAMMING:
+                return shouldOfferSwitchingToProgramming ? key : null;
+            }
+            break;
+          case Keyevent:
+            switch (key.getKeyevent())
+            {
+              case KeyEvent.KEYCODE_ENTER:
+                return (swapEnterActionKey && action_key != null) ? action_key : key;
+            }
+            break;
+          case Modifier:
+            if (lockable_modifiers.contains(key.getModifier()))
+              return key.withFlags(key.getFlags() | KeyValue.FLAG_LOCK);
+            break;
+        }
+        return key;
+      }
+    });
+    if (extra_keys.size() > 0)
+      kw = kw.addExtraKeys(extra_keys.iterator());
+    return kw;
   }
 
   private float getDipPref(DisplayMetrics dm, SharedPreferences prefs, String pref_name, float def)
@@ -135,6 +228,7 @@ final class Config
       case "light": return R.style.Light;
       case "black": return R.style.Black;
       case "dark": return R.style.Dark;
+      case "white": return R.style.White;
       default:
       case "system":
         if (Build.VERSION.SDK_INT >= 8)
@@ -152,45 +246,27 @@ final class Config
     switch (name)
     {
       case "azerty": return R.xml.azerty;
-      case "qwerty": return R.xml.qwerty;
-      case "qwerty_lv": return R.xml.qwerty_lv;
-      case "qwerty_es": return R.xml.qwerty_es;
-      case "ru_jcuken": return R.xml.local_ru_jcuken;
-      case "qwertz": return R.xml.qwertz;
+      case "bangla": return R.xml.bangla;
       case "bgph1": return R.xml.local_bgph1;
+      case "bone": return R.xml.bone;
+      case "colemak": return R.xml.colemak;
       case "dvorak": return R.xml.dvorak;
-      case "system": default: return -1;
-    }
-  }
-
-  /* Used for the accents option. */
-  public static int extra_key_flag_of_name(String name)
-  {
-    switch (name)
-    {
-      case "aigu": return KeyValue.FLAG_ACCENT2;
-      case "caron": return KeyValue.FLAG_ACCENT_CARON;
-      case "cedille": return KeyValue.FLAG_ACCENT5;
-      case "circonflexe": return KeyValue.FLAG_ACCENT3;
-      case "grave": return KeyValue.FLAG_ACCENT1;
-      case "macron": return KeyValue.FLAG_ACCENT_MACRON;
-      case "ring": return KeyValue.FLAG_ACCENT_RING;
-      case "szlig": return KeyValue.FLAG_LANG_SZLIG;
-      case "euro": return KeyValue.FLAG_LANG_EURO;
-      case "pound": return KeyValue.FLAG_LANG_POUND;
-      case "tilde": return KeyValue.FLAG_ACCENT4;
-      case "trema": return KeyValue.FLAG_ACCENT6;
-      default: throw new RuntimeException(name);
-    }
-  }
-
-  public static int themeId_of_string(String name)
-  {
-    switch (name)
-    {
-      case "light": return R.style.Light;
-      case "black": return R.style.Black;
-      default: case "dark": return R.style.Dark;
+      case "neo2": return R.xml.neo2;
+      case "qwerty_es": return R.xml.qwerty_es;
+      case "qwerty_hu": return R.xml.qwerty_hu;
+      case "qwerty_ko": return R.xml.qwerty_ko;
+      case "qwerty_lv": return R.xml.qwerty_lv;
+      case "qwerty_pt": return R.xml.qwerty_pt;
+      case "qwerty_tr": return R.xml.qwerty_tr;
+      case "qwerty": return R.xml.qwerty;
+      case "qwerty_no": return R.xml.qwerty_no;
+      case "qwerty_sv_se": return R.xml.qwerty_sv_se;
+      case "qwertz_hu": return R.xml.qwertz_hu;
+      case "qwertz_cs": return R.xml.qwertz_cs;
+      case "qwertz": return R.xml.qwertz;
+      case "ru_jcuken": return R.xml.local_ru_jcuken;
+      case "jcuken_ua": return R.xml.jcuken_ua;
+      default: return R.xml.qwerty; // The config might store an invalid layout, don't crash
     }
   }
 
@@ -208,6 +284,6 @@ final class Config
 
   public static interface IKeyEventHandler
   {
-    public void handleKeyUp(KeyValue value, int flags);
+    public void handleKeyUp(KeyValue value, Pointers.Modifiers flags);
   }
 }

srcs/juloo.keyboard2/Emoji.java

@@ -8,19 +8,32 @@ import java.io.BufferedReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-public class Emoji extends KeyValue
+public class Emoji
 {
+  private final String _name;
+  private final KeyValue _kv;
   private final String _desc;
 
   private static HashMap<String, Emoji> emojis_by_name = new HashMap<String, Emoji>();
 
   protected Emoji(String name, String bytecode, String desc)
   {
-    super(name, bytecode, CHAR_NONE, EVENT_NONE, 0);
+    _name = name;
+    _kv = new KeyValue(bytecode, KeyValue.KIND_STRING, 0, 0);
     _desc = desc;
     emojis_by_name.put(name, this);
   }
 
+  public String name()
+  {
+    return _name;
+  }
+
+  public KeyValue kv()
+  {
+    return _kv;
+  }
+
   public String getDescription()
   {
     return (_desc);

srcs/juloo.keyboard2/EmojiGridView.java

@@ -55,7 +55,7 @@ public class EmojiGridView extends GridView
     Config config = Config.globalConfig();
     Integer used = _lastUsed.get(_emojiArray[pos]);
     _lastUsed.put(_emojiArray[pos], (used == null) ? 1 : used.intValue() + 1);
-    config.handler.handleKeyUp(_emojiArray[pos], 0);
+    config.handler.handleKeyUp(_emojiArray[pos].kv(), Pointers.Modifiers.EMPTY);
     saveLastUsed(); // TODO: opti
   }
 
@@ -88,7 +88,7 @@ public class EmojiGridView extends GridView
     HashSet<String> set = new HashSet<String>();
 
     for (Emoji emoji : _lastUsed.keySet())
-      set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name);
+      set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name());
     edit.putStringSet(LAST_USE_PREF, set);
     edit.apply();
   }
@@ -126,7 +126,7 @@ public class EmojiGridView extends GridView
 
     public void setEmoji(Emoji emoji)
     {
-      setText(emoji.symbol);
+      setText(emoji.kv().getString());
     }
   }
 

srcs/juloo.keyboard2/EmojiGroupButtonsBar.java

@@ -15,7 +15,7 @@ public class EmojiGroupButtonsBar extends LinearLayout
     for (int i = 0; i < Emoji.num_groups; i++)
     {
       Emoji first = Emoji.getEmojisByGroup(i)[0];
-      add_group(i, first.symbol);
+      add_group(i, first.kv().getString());
     }
   }
 

srcs/juloo.keyboard2/EmojiKeyButton.java

@@ -14,15 +14,16 @@ public class EmojiKeyButton extends Button
   {
     super(context, attrs);
     setOnClickListener(this);
-    _key = KeyValue.getKeyByName(attrs.getAttributeValue(null, "key"));
-    setText(_key.symbol);
-    if ((_key.flags & KeyValue.FLAG_KEY_FONT) != 0)
-      setTypeface(Theme.getSpecialKeyFont(context));
+    String key_name = attrs.getAttributeValue(null, "key");
+    _key = (key_name == null) ? null : KeyValue.getKeyByName(key_name);
+    setText(_key.getString());
+    if (_key.hasFlags(KeyValue.FLAG_KEY_FONT))
+      setTypeface(Theme.getKeyFont(context));
   }
 
   public void onClick(View v)
   {
     Config config = Config.globalConfig();
-    config.handler.handleKeyUp(_key, 0);
+    config.handler.handleKeyUp(_key, Pointers.Modifiers.EMPTY);
   }
 }

srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java

@@ -0,0 +1,73 @@
+package juloo.keyboard2;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.content.SharedPreferences;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ExtraKeyCheckBoxPreference extends CheckBoxPreference
+{
+  public static String[] extra_keys = new String[]
+  {
+    "accent_aigu",
+    "accent_grave",
+    "accent_double_aigu",
+    "accent_dot_above",
+    "accent_circonflexe",
+    "accent_tilde",
+    "accent_cedille",
+    "accent_trema",
+    "accent_ring",
+    "accent_caron",
+    "accent_macron",
+    "accent_ogonek",
+    "€",
+    "ß",
+    "£",
+    "switch_greekmath",
+  };
+
+  boolean _key_font;
+
+  public ExtraKeyCheckBoxPreference(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ExtraKeyCheckBoxPreference);
+    int index = a.getInteger(R.styleable.ExtraKeyCheckBoxPreference_index, 0);
+    a.recycle();
+    String key_name = extra_keys[index];
+    setKey(pref_key_of_key_name(key_name));
+    KeyValue kv = KeyValue.getKeyByName(key_name);
+    setTitle(kv.getString());
+    _key_font = kv.hasFlags(KeyValue.FLAG_KEY_FONT);
+  }
+
+  @Override
+  protected void onBindView(View view)
+  {
+    super.onBindView(view);
+    TextView title = (TextView)view.findViewById(android.R.id.title);
+    title.setTypeface(_key_font ? Theme.getKeyFont(getContext()) : null);
+  }
+
+  static String pref_key_of_key_name(String key_name)
+  {
+    return "extra_key_" + key_name;
+  }
+
+  public static Set<KeyValue> get_extra_keys(SharedPreferences prefs)
+  {
+    HashSet<KeyValue> ks = new HashSet<KeyValue>();
+    for (String key_name : extra_keys)
+    {
+      if (prefs.getBoolean(pref_key_of_key_name(key_name), false))
+        ks.add(KeyValue.getKeyByName(key_name));
+    }
+    return ks;
+  }
+}

srcs/juloo.keyboard2/KeyEventHandler.java

@@ -11,27 +11,37 @@ class KeyEventHandler implements Config.IKeyEventHandler
     _recv = recv;
   }
 
-  public void handleKeyUp(KeyValue key, int flags)
+  public void handleKeyUp(KeyValue key, Pointers.Modifiers mods)
   {
-    key = KeyModifier.handleFlags(key, flags);
-    switch (key.eventCode)
+    if (key == null)
+      return;
+    switch (key.getKind())
     {
-    case KeyValue.EVENT_CONFIG: _recv.showKeyboardConfig(); return;
-    case KeyValue.EVENT_SWITCH_TEXT: _recv.setLayout(-1); return;
-    case KeyValue.EVENT_SWITCH_NUMERIC: _recv.setLayout(R.xml.numeric); return;
-    case KeyValue.EVENT_SWITCH_EMOJI: _recv.setPane_emoji(); return;
-    case KeyValue.EVENT_SWITCH_BACK_EMOJI: _recv.setPane_normal(); return;
-    case KeyValue.EVENT_CHANGE_METHOD: _recv.switchToNextInputMethod(); return;
-    case KeyValue.EVENT_ACTION: _recv.performAction(); return;
-    default:
-      if ((flags & (KeyValue.FLAG_CTRL | KeyValue.FLAG_ALT | KeyValue.FLAG_META)) != 0)
-        handleKeyUpWithModifier(key, flags);
-      else if (key.char_ != KeyValue.CHAR_NONE)
-        _recv.commitChar(key.char_);
-      else if (key.eventCode != KeyValue.EVENT_NONE)
-        handleKeyUpWithModifier(key, flags);
-      else
-        _recv.commitText(key.symbol);
+      case Char:
+        _recv.commitChar(key.getChar());
+        break;
+      case String:
+        _recv.commitText(key.getString());
+        break;
+      case Event:
+        switch (key.getEvent())
+        {
+          case CONFIG: _recv.showKeyboardConfig(); break;
+          case SWITCH_TEXT: _recv.switchMain(); break;
+          case SWITCH_NUMERIC: _recv.switchNumeric(); break;
+          case SWITCH_EMOJI: _recv.setPane_emoji(); break;
+          case SWITCH_BACK_EMOJI: _recv.setPane_normal(); break;
+          case CHANGE_METHOD: _recv.switchToNextInputMethod(); break;
+          case ACTION: _recv.performAction(); break;
+          case SWITCH_PROGRAMMING: _recv.switchProgramming(); break;
+          case SWITCH_GREEKMATH: _recv.switchGreekmath(); break;
+        }
+        break;
+      case Keyevent:
+        handleKeyUpWithModifier(key.getKeyevent(), mods);
+        break;
+      case Modifier:
+        break;
     }
   }
 
@@ -55,31 +65,34 @@ class KeyEventHandler implements Config.IKeyEventHandler
     return updatedMetaState;
   }
 
-  /* Send key events corresponding to pressed modifier keys. */
-  private int sendMetaKeys(int flags, int metaState, boolean down)
+  private int sendMetaKeyForModifier(KeyValue.Modifier mod, int metaState, boolean down)
   {
-		if ((flags & KeyValue.FLAG_CTRL) != 0)
-      metaState = sendMetaKey(KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_ON, metaState, down);
-		if ((flags & KeyValue.FLAG_ALT) != 0)
-      metaState = sendMetaKey(KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_ON, metaState, down);
-		if ((flags & KeyValue.FLAG_SHIFT) != 0)
-      metaState = sendMetaKey(KeyEvent.KEYCODE_SHIFT_LEFT, KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_SHIFT_ON, metaState, down);
-    if ((flags & KeyValue.FLAG_META) != 0)
-      metaState = sendMetaKey(KeyEvent.KEYCODE_META_LEFT, KeyEvent.META_META_LEFT_ON | KeyEvent.META_META_ON, metaState, down);
-    return metaState;
+    switch (mod)
+    {
+      case CTRL:
+        return sendMetaKey(KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_ON, metaState, down);
+      case ALT:
+        return sendMetaKey(KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_ON, metaState, down);
+      case SHIFT:
+        return sendMetaKey(KeyEvent.KEYCODE_SHIFT_LEFT, KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_SHIFT_ON, metaState, down);
+      case META:
+        return sendMetaKey(KeyEvent.KEYCODE_META_LEFT, KeyEvent.META_META_LEFT_ON | KeyEvent.META_META_ON, metaState, down);
+      default: return metaState;
+    }
   }
 
   /*
    * Don't set KeyEvent.FLAG_SOFT_KEYBOARD.
    */
-	private void handleKeyUpWithModifier(KeyValue key, int flags)
+	private void handleKeyUpWithModifier(int keyCode, Pointers.Modifiers mods)
 	{
-		if (key.eventCode == KeyValue.EVENT_NONE)
-			return ;
-    int metaState = sendMetaKeys(flags, 0, true);
-		_recv.sendKeyEvent(KeyEvent.ACTION_DOWN, key.eventCode, metaState);
-    _recv.sendKeyEvent(KeyEvent.ACTION_UP, key.eventCode, metaState);
-    sendMetaKeys(flags, metaState, false);
+    int metaState = 0;
+    for (int i = 0; i < mods.size(); i++)
+      metaState = sendMetaKeyForModifier(mods.get(i), metaState, true);
+		_recv.sendKeyEvent(KeyEvent.ACTION_DOWN, keyCode, metaState);
+    _recv.sendKeyEvent(KeyEvent.ACTION_UP, keyCode, metaState);
+    for (int i = mods.size() - 1; i >= 0; i--)
+      metaState = sendMetaKeyForModifier(mods.get(i), metaState, false);
 	}
 
   public static interface IReceiver
@@ -90,8 +103,10 @@ class KeyEventHandler implements Config.IKeyEventHandler
     public void showKeyboardConfig();
     public void performAction();
 
-    /** 'res_id' is '-1' for the currently selected layout. */
-    public void setLayout(int res_id);
+    public void switchMain();
+    public void switchNumeric();
+    public void switchProgramming();
+    public void switchGreekmath();
 
     public void sendKeyEvent(int eventAction, int eventCode, int meta);
 

srcs/juloo.keyboard2/KeyModifier.java

@@ -1,119 +1,382 @@
 package juloo.keyboard2;
 
-import android.util.SparseArray;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import java.util.HashMap;
 
 class KeyModifier
 {
-  /* Cache key is KeyValue's name */
-  private static HashMap<String, SparseArray<KeyValue>> _cache =
-    new HashMap<String, SparseArray<KeyValue>>();
+  /** Cache key is KeyValue's name */
+  private static HashMap<KeyValue, HashMap<Pointers.Modifiers, KeyValue>> _cache =
+    new HashMap<KeyValue, HashMap<Pointers.Modifiers, KeyValue>>();
 
-  /* Modify a key according to modifiers. */
-  public static KeyValue handleFlags(KeyValue k, int flags)
+  /** Modify a key according to modifiers. */
+  public static KeyValue modify(KeyValue k, Pointers.Modifiers mods)
   {
-    if (flags == 0) // No modifier
-      return k;
-    SparseArray<KeyValue> ks = cacheEntry(k);
-    KeyValue r = ks.get(flags);
-    if (r != null) // Found in cache
-      return r;
-    r = k;
-    r = handleFn(r, flags);
-    r = handleShift(r, flags);
-    r = handleAccents(r, flags);
-    ks.put(flags, r);
-    return r;
-  }
-
-  private static KeyValue handleAccents(KeyValue k, int flags)
-  {
-    if (k.char_ == KeyValue.CHAR_NONE || (flags & KeyValue.FLAGS_ACCENTS) == 0)
-      return k;
-    char c = handleAccentChar(k.char_, flags);
-    if (c == 0 || c == k.char_)
-      return k;
-    return k.withCharAndSymbol(c);
-  }
-
-  private static KeyValue handleShift(KeyValue k, int flags)
-  {
-    if ((flags & KeyValue.FLAG_SHIFT) == 0)
-      return k;
-    char c = k.char_;
-    if (k.char_ != KeyValue.CHAR_NONE)
-      c = Character.toUpperCase(c);
-    if (c == k.char_) // More rules if toUpperCase() did nothing
-      switch (k.symbol)
-      {
-        case "→": c = '⇒'; break;
-        case "←": c = '⇐'; break;
-        case "<": c = '«'; break;
-        case ">": c = '»'; break;
-        case "“": c = '”'; break;
-        default: return k;
-      }
-    return k.withCharAndSymbol(c);
-  }
-
-  private static char handleAccentChar(char c, int flags)
-  {
-    switch ((flags & KeyValue.FLAGS_ACCENTS))
+    if (k == null)
+      return null;
+    int n_mods = mods.size();
+    HashMap<Pointers.Modifiers, KeyValue> ks = cacheEntry(k);
+    KeyValue r = ks.get(mods);
+    if (r == null)
     {
-      case KeyValue.FLAG_ACCENT1:
-        return (char)KeyCharacterMap.getDeadChar('\u02CB', c);
-      case KeyValue.FLAG_ACCENT2:
+      r = k;
+      /* Order: Fn, Shift, accents */
+      for (int i = 0; i < n_mods; i++)
+        r = modify(r, mods.get(i));
+      ks.put(mods, r);
+    }
+    /* Keys with an empty string are placeholder keys. */
+    return (r.getString().length() == 0) ? null : r;
+  }
+
+  public static KeyValue modify(KeyValue k, KeyValue.Modifier mod)
+  {
+    switch (mod)
+    {
+      case CTRL:
+      case ALT:
+      case META: return turn_into_keyevent(k);
+      case FN: return apply_fn(k);
+      case SHIFT: return apply_shift(k);
+      case GRAVE: return apply_dead_char(k, '\u02CB');
+      case AIGU: return apply_dead_char(k, '\u00B4');
+      case CIRCONFLEXE: return apply_dead_char(k, '\u02C6');
+      case TILDE: return apply_dead_char(k, '\u02DC');
+      case CEDILLE: return apply_dead_char(k, '\u00B8');
+      case TREMA: return apply_dead_char(k, '\u00A8');
+      case CARON: return apply_dead_char(k, '\u02C7');
+      case RING: return apply_dead_char(k, '\u02DA');
+      case MACRON: return apply_dead_char(k, '\u00AF');
+      case OGONEK: return apply_dead_char(k, '\u02DB');
+      case DOT_ABOVE: return apply_dead_char(k, '\u02D9');
+      case DOUBLE_AIGU: return apply_map_char(k, map_char_double_aigu);
+      case ORDINAL: return apply_map_char(k, map_char_ordinal);
+      case SUPERSCRIPT: return apply_map_char(k, map_char_superscript);
+      case SUBSCRIPT: return apply_map_char(k, map_char_subscript);
+      case ARROWS: return apply_map_char(k, map_char_arrows);
+      case BOX: return apply_map_char(k, map_char_box);
+      case SLASH: return apply_map_char(k, map_char_slash);
+      case ARROW_RIGHT: return apply_combining(k, "\u20D7");
+      default: return k;
+    }
+  }
+
+  private static KeyValue apply_map_char(KeyValue k, Map_char map)
+  {
+    switch (k.getKind())
+    {
+      case Char:
+        char kc = k.getChar();
+        char c = map.apply(kc);
+        return (kc == c) ? k : k.withChar(c);
+      default: return k;
+    }
+  }
+
+  private static KeyValue apply_dead_char(KeyValue k, char dead_char)
+  {
+    switch (k.getKind())
+    {
+      case Char:
+        char kc = k.getChar();
+        char c = (char)KeyCharacterMap.getDeadChar(dead_char, kc);
+        return (c == 0 || kc == c) ? k : k.withChar(c);
+      default: return k;
+    }
+  }
+
+  private static KeyValue apply_combining(KeyValue k, String combining)
+  {
+    switch (k.getKind())
+    {
+      case Char:
+        return k.withString(String.valueOf(k.getChar()) + combining);
+      default: return k;
+    }
+  }
+
+  private static KeyValue apply_shift(KeyValue k)
+  {
+    switch (k.getKind())
+    {
+      case Char:
+        char kc = k.getChar();
+        char c = map_char_shift(kc);
+        if (kc == c)
+          c = Character.toUpperCase(kc);
+        return (kc == c) ? k : k.withChar(c);
+      case String:
+        return k.withString(k.getString().toUpperCase());
+      default: return k;
+    }
+  }
+
+  private static KeyValue apply_fn(KeyValue k)
+  {
+    String name = null;
+    switch (k.getKind())
+    {
+      case Char: name = apply_fn_char(k.getChar()); break;
+      case Keyevent: name = apply_fn_keyevent(k.getKeyevent()); break;
+      case Event: name = apply_fn_event(k.getEvent()); break;
+      case String:
+        switch (k.getString())
+        {
+          case "":
+            if (k == KeyValue.getKeyByName("f11_placeholder"))
+              name = "f11";
+            else if (k == KeyValue.getKeyByName("f12_placeholder"))
+              name = "f12";
+            break;
+        }
+        break;
+    }
+    return (name == null) ? k : KeyValue.getKeyByName(name);
+  }
+
+  private static String apply_fn_keyevent(int code)
+  {
+    switch (code)
+    {
+      case KeyEvent.KEYCODE_DPAD_UP: return "page_up";
+      case KeyEvent.KEYCODE_DPAD_DOWN: return "page_down";
+      case KeyEvent.KEYCODE_DPAD_LEFT: return "home";
+      case KeyEvent.KEYCODE_DPAD_RIGHT: return "end";
+      case KeyEvent.KEYCODE_ESCAPE: return "insert";
+      default: return null;
+    }
+  }
+
+  private static String apply_fn_event(KeyValue.Event ev)
+  {
+    switch (ev)
+    {
+      case SWITCH_NUMERIC: return "switch_greekmath";
+      default: return null;
+    }
+  }
+
+  /** Return the name of modified key, or [null]. */
+  private static String apply_fn_char(char c)
+  {
+    switch (c)
+    {
+      case '1': return "f1";
+      case '2': return "f2";
+      case '3': return "f3";
+      case '4': return "f4";
+      case '5': return "f5";
+      case '6': return "f6";
+      case '7': return "f7";
+      case '8': return "f8";
+      case '9': return "f9";
+      case '0': return "f10";
+      case '<': return "«";
+      case '>': return "»";
+      case '{': return "‹";
+      case '}': return "›";
+      case '[': return "‘";
+      case ']': return "’";
+      case '(': return "“";
+      case ')': return "”";
+      case '\'': return "‚";
+      case '"': return "„";
+      case '-': return "–";
+      case '_': return "—";
+      case '^': return "¬";
+      case '%': return "‰";
+      case '=': return "≈";
+      case 'u': return "µ";
+      case 'a': return "æ";
+      case 'o': return "œ";
+      case '*': return "°";
+      case '.': return "…";
+      case ',': return "·";
+      case '!': return "¡";
+      case '?': return "¿";
+      // arrows
+      case '↖': return "⇖";
+      case '↑': return "⇑";
+      case '↗': return "⇗";
+      case '←': return "⇐";
+      case '→': return "⇒";
+      case '↙': return "⇙";
+      case '↓': return "⇓";
+      case '↘': return "⇘";
+      case '↔': return "⇔";
+      case '↕': return "⇕";
+      // Currency symbols
+      case 'e': return "€";
+      case 'l': return "£";
+      case 'r': return "₹";
+      case 'y': return "¥";
+      case 'c': return "¢";
+      case 'p': return "₱";
+      case '€': case '£': return "removed"; // Avoid showing these twice
+      // alternating greek letters
+      case 'π': return "ϖ";
+      case 'θ': return "ϑ";
+      case 'Θ': return "ϴ";
+      case 'ε': return "ϵ";
+      case 'β': return "ϐ";
+      case 'ρ': return "ϱ";
+      case 'σ': return "ς";
+      case 'γ': return "ɣ";
+      case 'φ': return "ϕ";
+      case 'υ': return "ϒ";
+      case 'κ': return "ϰ";
+      // alternating math characters
+      case '∪': return "⋃";
+      case '∩': return "⋂";
+      case '∃': return "∄";
+      case '∈': return "∉";
+      case '∫': return "∮";
+      case 'Π': return "∏";
+      case 'Σ': return "∑";
+      case '∨': return "⋁";
+      case '∧': return "⋀";
+      case '⊷': return "⊶";
+      case '⊂': return "⊆";
+      case '⊃': return "⊇";
+      case '±': return "∓";
+      // other
+      case '\t': return "\\t";
+      case ' ': return "nbsp";
+      default: return null;
+    }
+  }
+
+  private static KeyValue turn_into_keyevent(KeyValue k)
+  {
+    if (k.getKind() != KeyValue.Kind.Char)
+      return k;
+    int e;
+    switch (k.getChar())
+    {
+      case 'a': e = KeyEvent.KEYCODE_A; break;
+      case 'b': e = KeyEvent.KEYCODE_B; break;
+      case 'c': e = KeyEvent.KEYCODE_C; break;
+      case 'd': e = KeyEvent.KEYCODE_D; break;
+      case 'e': e = KeyEvent.KEYCODE_E; break;
+      case 'f': e = KeyEvent.KEYCODE_F; break;
+      case 'g': e = KeyEvent.KEYCODE_G; break;
+      case 'h': e = KeyEvent.KEYCODE_H; break;
+      case 'i': e = KeyEvent.KEYCODE_I; break;
+      case 'j': e = KeyEvent.KEYCODE_J; break;
+      case 'k': e = KeyEvent.KEYCODE_K; break;
+      case 'l': e = KeyEvent.KEYCODE_L; break;
+      case 'm': e = KeyEvent.KEYCODE_M; break;
+      case 'n': e = KeyEvent.KEYCODE_N; break;
+      case 'o': e = KeyEvent.KEYCODE_O; break;
+      case 'p': e = KeyEvent.KEYCODE_P; break;
+      case 'q': e = KeyEvent.KEYCODE_Q; break;
+      case 'r': e = KeyEvent.KEYCODE_R; break;
+      case 's': e = KeyEvent.KEYCODE_S; break;
+      case 't': e = KeyEvent.KEYCODE_T; break;
+      case 'u': e = KeyEvent.KEYCODE_U; break;
+      case 'v': e = KeyEvent.KEYCODE_V; break;
+      case 'w': e = KeyEvent.KEYCODE_W; break;
+      case 'x': e = KeyEvent.KEYCODE_X; break;
+      case 'y': e = KeyEvent.KEYCODE_Y; break;
+      case 'z': e = KeyEvent.KEYCODE_Z; break;
+      case '0': e = KeyEvent.KEYCODE_0; break;
+      case '1': e = KeyEvent.KEYCODE_1; break;
+      case '2': e = KeyEvent.KEYCODE_2; break;
+      case '3': e = KeyEvent.KEYCODE_3; break;
+      case '4': e = KeyEvent.KEYCODE_4; break;
+      case '5': e = KeyEvent.KEYCODE_5; break;
+      case '6': e = KeyEvent.KEYCODE_6; break;
+      case '7': e = KeyEvent.KEYCODE_7; break;
+      case '8': e = KeyEvent.KEYCODE_8; break;
+      case '9': e = KeyEvent.KEYCODE_9; break;
+      case '`': e = KeyEvent.KEYCODE_GRAVE; break;
+      case '-': e = KeyEvent.KEYCODE_MINUS; break;
+      case '=': e = KeyEvent.KEYCODE_EQUALS; break;
+      case '[': e = KeyEvent.KEYCODE_LEFT_BRACKET; break;
+      case ']': e = KeyEvent.KEYCODE_RIGHT_BRACKET; break;
+      case '\\': e = KeyEvent.KEYCODE_BACKSLASH; break;
+      case ';': e = KeyEvent.KEYCODE_SEMICOLON; break;
+      case '\'': e = KeyEvent.KEYCODE_APOSTROPHE; break;
+      case '/': e = KeyEvent.KEYCODE_SLASH; break;
+      case '@': e = KeyEvent.KEYCODE_AT; break;
+      case '+': e = KeyEvent.KEYCODE_PLUS; break;
+      case ',': e = KeyEvent.KEYCODE_COMMA; break;
+      case '.': e = KeyEvent.KEYCODE_PERIOD; break;
+      case '*': e = KeyEvent.KEYCODE_STAR; break;
+      case '#': e = KeyEvent.KEYCODE_POUND; break;
+      case '(': e = KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN; break;
+      case ')': e = KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN; break;
+      case ' ': e = KeyEvent.KEYCODE_SPACE; break;
+      default: return k;
+    }
+    return k.withKeyevent(e);
+  }
+
+  /* Lookup the cache entry for a key. Create it needed. */
+  private static HashMap<Pointers.Modifiers, KeyValue> cacheEntry(KeyValue k)
+  {
+    HashMap<Pointers.Modifiers, KeyValue> ks = _cache.get(k);
+    if (ks == null)
+    {
+      ks = new HashMap<Pointers.Modifiers, KeyValue>();
+      _cache.put(k, ks);
+    }
+    return ks;
+  }
+
+  private static abstract class Map_char
+  {
+    public abstract char apply(char c);
+  }
+
+  private static char map_char_shift(char c)
+  {
+    switch (c)
+    {
+      case '↙': return '⇙';
+      case '↓': return '⇓';
+      case '↘': return '⇘';
+      case '←': return '⇐';
+      case '→': return '⇒';
+      case '↖': return '⇖';
+      case '↑': return '⇑';
+      case '↗': return '⇗';
+      case '└': return '╚';
+      case '┴': return '╩';
+      case '┘': return '╝';
+      case '├': return '╠';
+      case '┼': return '╬';
+      case '┤': return '╣';
+      case '┌': return '╔';
+      case '┬': return '╦';
+      case '┐': return '╗';
+      case '─': return '═';
+      case '│': return '║';
+      case 'ß': return 'ẞ';
+      default: return c;
+    }
+  }
+
+  private static final Map_char map_char_double_aigu =
+    new Map_char() {
+      public char apply(char c)
+      {
         switch (c)
         {
-          case '`': return '´';
-          case '<': return '‘';
-          case '>': return '‘';
-          default: return (char)KeyCharacterMap.getDeadChar('\u00B4', c);
+          // Composite characters: a̋ e̋ i̋ m̋ ӳ
+          case 'o': return 'ő';
+          case 'u': return 'ű';
+          case ' ': return '˝';
+          default: return c;
         }
-      case KeyValue.FLAG_ACCENT3:
-        return (char)KeyCharacterMap.getDeadChar('\u02C6', c);
-      case KeyValue.FLAG_ACCENT4:
-        switch (c)
-        {
-          case '?': return '¿';
-          case '!': return '¡';
-          default: return (char)KeyCharacterMap.getDeadChar('\u02DC', c);
-        }
-      case KeyValue.FLAG_ACCENT5:
-        switch (c)
-        {
-          case 'u': return 'µ';
-          case '"': return '„';
-          case '\'': return '’';
-          case '-': return '¬';
-          case 'a': return 'æ';
-          case 'o': return 'œ';
-          default: return (char)KeyCharacterMap.getDeadChar('\u00B8', c);
-        }
-      case KeyValue.FLAG_ACCENT6:
-        switch (c)
-        {
-          case '-': return '÷';
-          default: return (char)KeyCharacterMap.getDeadChar('\u00A8', c);
-        }
-      case KeyValue.FLAG_ACCENT_CARON:
-        switch (c)
-        {
-          default: return (char)KeyCharacterMap.getDeadChar('\u02C7', c);
-        }
-      case KeyValue.FLAG_ACCENT_RING:
-        switch (c)
-        {
-          default: return (char)KeyCharacterMap.getDeadChar('\u02DA', c);
-        }
-      case KeyValue.FLAG_ACCENT_MACRON:
-        switch (c)
-        {
-          default: return (char)KeyCharacterMap.getDeadChar('\u00AF', c);
-        }
-      case KeyValue.FLAG_ACCENT_ORDINAL:
+      }
+    };
+
+  private static final Map_char map_char_ordinal =
+    new Map_char() {
+      public char apply(char c)
+      {
         switch (c)
         {
           case 'a': return 'ª';
@@ -130,7 +393,13 @@ class KeyModifier
           case '*': return '°';
           default: return c;
         }
-      case KeyValue.FLAG_ACCENT_SUPERSCRIPT:
+      }
+    };
+
+  private static final Map_char map_char_superscript =
+    new Map_char() {
+      public char apply(char c)
+      {
         switch (c)
         {
           case '1': return '¹';
@@ -152,7 +421,13 @@ class KeyModifier
           case 'n': return 'ⁿ';
           default: return c;
         }
-      case KeyValue.FLAG_ACCENT_SUBSCRIPT:
+      }
+    };
+
+  private static final Map_char map_char_subscript =
+    new Map_char() {
+      public char apply(char c)
+      {
         switch (c)
         {
           case '1': return '₁';
@@ -176,55 +451,66 @@ class KeyModifier
           case 'o': return 'ₒ';
           default: return c;
         }
-      default: return c; // Can't happen
-    }
-  }
+      }
+    };
 
-  private static KeyValue handleFn(KeyValue k, int flags)
-  {
-    if ((flags & KeyValue.FLAG_FN) == 0)
-      return k;
-    String name;
-    switch (k.name)
-    {
-      case "1": name = "f1"; break;
-      case "2": name = "f2"; break;
-      case "3": name = "f3"; break;
-      case "4": name = "f4"; break;
-      case "5": name = "f5"; break;
-      case "6": name = "f6"; break;
-      case "7": name = "f7"; break;
-      case "8": name = "f8"; break;
-      case "9": name = "f9"; break;
-      case "0": name = "f10"; break;
-      case "up": name = "page_up"; break;
-      case "down": name = "page_down"; break;
-      case "left": name = "home"; break;
-      case "right": name = "end"; break;
-      case ">": name = "→"; break;
-      case "<": name = "←"; break;
-      case "\"": name = "“"; break;
-      case "-": name = "–"; break;
-      case "_": name = "—"; break;
-      case "esc": name = "insert"; break;
-      case "$": name = "€"; break;
-      case "#": name = "£"; break;
-      case "*": name = "°"; break;
-      case "tab": name = "\\t"; break;
-      default: return k;
-    }
-    return KeyValue.getKeyByName(name);
-  }
+  private static final Map_char map_char_arrows =
+    new Map_char() {
+      public char apply(char c)
+      {
+        switch (c)
+        {
+          case '1': return '↙';
+          case '2': return '↓';
+          case '3': return '↘';
+          case '4': return '←';
+          case '6': return '→';
+          case '7': return '↖';
+          case '8': return '↑';
+          case '9': return '↗';
+          default: return c;
+        }
+      }
+    };
 
-  /* Lookup the cache entry for a key. Create it needed. */
-  private static SparseArray<KeyValue> cacheEntry(KeyValue k)
-  {
-    SparseArray<KeyValue> ks = _cache.get(k.name);
-    if (ks == null)
-    {
-      ks = new SparseArray<KeyValue>();
-      _cache.put(k.name, ks);
-    }
-    return ks;
-  }
+  private static final Map_char map_char_box =
+    new Map_char() {
+      public char apply(char c)
+      {
+        switch (c)
+        {
+          case '1': return '└';
+          case '2': return '┴';
+          case '3': return '┘';
+          case '4': return '├';
+          case '5': return '┼';
+          case '6': return '┤';
+          case '7': return '┌';
+          case '8': return '┬';
+          case '9': return '┐';
+          case '0': return '─';
+          case '.': return '│';
+          default: return c;
+        }
+      }
+    };
+
+  private static final Map_char map_char_slash =
+    new Map_char() {
+      public char apply(char c)
+      {
+        switch (c)
+        {
+          case 'a': return 'ⱥ';
+          case 'c': return 'ȼ';
+          case 'e': return 'ɇ';
+          case 'g': return 'ꞡ';
+          case 'l': return 'ł';
+          case 'n': return 'ꞥ';
+          case 'o': return 'ø';
+          case ' ': return '/';
+          default: return c;
+        }
+      }
+    };
 }

srcs/juloo.keyboard2/KeyValue.java

@@ -4,266 +4,324 @@ import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import java.util.HashMap;
 
-class KeyValue
+final class KeyValue
 {
-  public static final int EVENT_NONE = -1;
-  public static final int EVENT_CONFIG = -2;
-  public static final int EVENT_SWITCH_TEXT = -3;
-  public static final int EVENT_SWITCH_NUMERIC = -4;
-  public static final int EVENT_SWITCH_EMOJI = -5;
-  public static final int EVENT_SWITCH_BACK_EMOJI = -6;
-  public static final int EVENT_CHANGE_METHOD = -7;
-  public static final int EVENT_ACTION = -8;
-  public static final char CHAR_NONE = '\0';
-
-  // Behavior flags
-  public static final int FLAG_LATCH = 1;
-  public static final int FLAG_LOCK = (1 << 1);
-  public static final int FLAG_NOREPEAT = (1 << 2);
-  public static final int FLAG_NOCHAR = (1 << 3);
-  public static final int FLAG_PRECISE_REPEAT = (1 << 4);
-
-  // Rendering flags
-  public static final int FLAG_KEY_FONT = (1 << 5);
-  public static final int FLAG_SMALLER_FONT = (1 << 6);
-
-  // Internal flags
-  public static final int FLAG_LOCKED = (1 << 8);
-
-  // Modifier flags
-  public static final int FLAG_CTRL = (1 << 10);
-  public static final int FLAG_SHIFT = (1 << 11);
-  public static final int FLAG_ALT = (1 << 12);
-  public static final int FLAG_FN = (1 << 13);
-  public static final int FLAG_META = (1 << 14);
-
-  // Accent flags
-  public static final int FLAG_ACCENT1 = (1 << 16); // Grave
-  public static final int FLAG_ACCENT2 = (1 << 17); // Aigu
-  public static final int FLAG_ACCENT3 = (1 << 18); // Circonflexe
-  public static final int FLAG_ACCENT4 = (1 << 19); // Tilde
-  public static final int FLAG_ACCENT5 = (1 << 20); // Cédille
-  public static final int FLAG_ACCENT6 = (1 << 21); // Tréma
-  public static final int FLAG_ACCENT_SUPERSCRIPT = (1 << 22);
-  public static final int FLAG_ACCENT_SUBSCRIPT = (1 << 23);
-  public static final int FLAG_ACCENT_RING = (1 << 24);
-  public static final int FLAG_ACCENT_CARON = (1 << 26);
-  public static final int FLAG_ACCENT_MACRON = (1 << 27);
-  public static final int FLAG_ACCENT_ORDINAL = (1 << 28);
-
-
-  public static final int FLAGS_ACCENTS = FLAG_ACCENT1 | FLAG_ACCENT2 |
-    FLAG_ACCENT3 | FLAG_ACCENT4 | FLAG_ACCENT5 | FLAG_ACCENT6 |
-    FLAG_ACCENT_CARON | FLAG_ACCENT_MACRON | FLAG_ACCENT_SUPERSCRIPT |
-    FLAG_ACCENT_SUBSCRIPT | FLAG_ACCENT_ORDINAL | FLAG_ACCENT_RING;
-
-  // Language specific keys
-  public static final int FLAG_LANG_SZLIG = (1 << 25);
-  public static final int FLAG_LANG_EURO = (1 << 29);
-  public static final int FLAG_LANG_POUND = (1 << 30);
-
-  public static final int FLAGS_LANGS = FLAG_LANG_SZLIG | FLAG_LANG_EURO |
-    FLAG_LANG_POUND;
-
-  public static final int FLAGS_NOT_HIDDEN_ACCENTS = FLAG_ACCENT_SUPERSCRIPT |
-    FLAG_ACCENT_SUBSCRIPT | FLAG_ACCENT_ORDINAL;
-  // Keys that have to be enabled per language
-  public static final int FLAGS_HIDDEN_KEYS =
-    (FLAGS_ACCENTS & ~FLAGS_NOT_HIDDEN_ACCENTS) | FLAGS_LANGS;
-
-  public final String name;
-  public final String symbol;
-  public final char char_;
-  public final int eventCode;
-  public final int flags;
-
-  /* Update the char and the symbol. */
-  public KeyValue withCharAndSymbol(char c)
+  public static enum Event
   {
-    return withCharAndSymbol(String.valueOf(c), c);
+    CONFIG,
+    SWITCH_TEXT,
+    SWITCH_NUMERIC,
+    SWITCH_EMOJI,
+    SWITCH_BACK_EMOJI,
+    CHANGE_METHOD,
+    ACTION,
+    SWITCH_PROGRAMMING,
+    SWITCH_GREEKMATH
   }
 
-  public KeyValue withCharAndSymbol(String s, char c)
+  // Must be evaluated in the reverse order of their values.
+  public static enum Modifier
   {
-    return new KeyValue(name, s, c, eventCode, flags);
+    SHIFT,
+    FN,
+    CTRL,
+    ALT,
+    META,
+    DOUBLE_AIGU,
+    DOT_ABOVE,
+    GRAVE,
+    AIGU,
+    CIRCONFLEXE,
+    TILDE,
+    CEDILLE,
+    TREMA,
+    SUPERSCRIPT,
+    SUBSCRIPT,
+    RING,
+    CARON,
+    MACRON,
+    ORDINAL,
+    ARROWS,
+    BOX,
+    OGONEK,
+    SLASH,
+    ARROW_RIGHT
+  }
+
+  // Behavior flags.
+  public static final int FLAG_LATCH = (1 << 20);
+  public static final int FLAG_LOCK = (1 << 21);
+  // Special keys are not repeated and don't clear latched modifiers.
+  public static final int FLAG_SPECIAL = (1 << 22);
+  public static final int FLAG_PRECISE_REPEAT = (1 << 23);
+  // Rendering flags.
+  public static final int FLAG_KEY_FONT = (1 << 24);
+  public static final int FLAG_SMALLER_FONT = (1 << 25);
+  // Used by [Pointers].
+  public static final int FLAG_LOCKED = (1 << 26);
+  public static final int FLAG_FAKE_PTR = (1 << 27);
+
+  // Kinds
+  public static final int KIND_CHAR = (0 << 29);
+  public static final int KIND_STRING = (1 << 29);
+  public static final int KIND_KEYEVENT = (2 << 29);
+  public static final int KIND_EVENT = (3 << 29);
+  public static final int KIND_MODIFIER = (4 << 29);
+
+  // Ranges for the different components
+  private static final int FLAGS_BITS = (0b111111111 << 20); // 9 bits wide
+  private static final int KIND_BITS = (0b111 << 29); // 3 bits wide
+  private static final int VALUE_BITS = ~(FLAGS_BITS | KIND_BITS); // 20 bits wide
+  static
+  {
+    check((FLAGS_BITS & KIND_BITS) == 0); // No overlap
+    check((FLAGS_BITS | KIND_BITS | VALUE_BITS) == ~0); // No holes
+  }
+
+  private final String _symbol;
+
+  /** This field encodes three things:
+      - The kind
+      - The flags
+      - The value for Char, Event and Modifier keys.
+      */
+  private final int _code;
+
+  public static enum Kind
+  {
+    Char, String, Keyevent, Event, Modifier
+  }
+
+  public Kind getKind()
+  {
+    switch (_code & KIND_BITS)
+    {
+      case KIND_CHAR: return Kind.Char;
+      case KIND_STRING: return Kind.String;
+      case KIND_KEYEVENT: return Kind.Keyevent;
+      case KIND_EVENT: return Kind.Event;
+      case KIND_MODIFIER: return Kind.Modifier;
+      default: throw new RuntimeException("Corrupted kind flags");
+    }
+  }
+
+  public int getFlags()
+  {
+    return (_code & FLAGS_BITS);
+  }
+
+  public boolean hasFlags(int has)
+  {
+    return ((_code & has) == has);
+  }
+
+  /** The string to render on the keyboard.
+      When [getKind() == Kind.String], also the string to send. */
+  public String getString()
+  {
+    return _symbol;
+  }
+
+  /** Defined only when [getKind() == Kind.Char]. */
+  public char getChar()
+  {
+    return (char)(_code & VALUE_BITS);
+  }
+
+  /** Defined only when [getKind() == Kind.Keyevent]. */
+  public int getKeyevent()
+  {
+    return (_code & VALUE_BITS);
+  }
+
+  /** Defined only when [getKind() == Kind.Event]. */
+  public Event getEvent()
+  {
+    return Event.values()[(_code & VALUE_BITS)];
+  }
+
+  /** Defined only when [getKind() == Kind.Modifier]. */
+  public Modifier getModifier()
+  {
+    return Modifier.values()[(_code & VALUE_BITS)];
+  }
+
+  /* Update the char and the symbol. */
+  public KeyValue withChar(char c)
+  {
+    return new KeyValue(String.valueOf(c), KIND_CHAR, c, getFlags());
+  }
+
+  public KeyValue withString(String s)
+  {
+    return new KeyValue(s, KIND_STRING, 0, getFlags());
+  }
+
+  public KeyValue withSymbol(String s)
+  {
+    return new KeyValue(s, (_code & KIND_BITS), (_code & VALUE_BITS), getFlags());
+  }
+
+  public KeyValue withKeyevent(int code)
+  {
+    return new KeyValue(_symbol, KIND_KEYEVENT, code, getFlags());
+  }
+
+  public KeyValue withFlags(int f)
+  {
+    return new KeyValue(_symbol, (_code & KIND_BITS), (_code & VALUE_BITS), f);
+  }
+
+  @Override
+  public boolean equals(Object obj)
+  {
+    KeyValue snd = (KeyValue)obj;
+    return _symbol.equals(snd._symbol) && _code == snd._code;
+  }
+
+  @Override
+  public int hashCode()
+  {
+    return _symbol.hashCode() + _code;
   }
 
   private static HashMap<String, KeyValue> keys = new HashMap<String, KeyValue>();
 
-  public KeyValue(String n, String s, char c, int e, int f)
+  public KeyValue(String s, int kind, int value, int flags)
   {
-    name = n;
-    symbol = s;
-    char_ = c;
-    eventCode = e;
-    flags = f;
+    check((kind & ~KIND_BITS) == 0);
+    check((flags & ~FLAGS_BITS) == 0);
+    check((value & ~VALUE_BITS) == 0);
+    _symbol = s;
+    _code = kind | flags | value;
   }
 
   public static KeyValue getKeyByName(String name)
   {
-    if (name == null)
-      return null;
-    KeyValue kv = KeyValue.keys.get(name);
+    KeyValue kv = keys.get(name);
     if (kv != null)
       return kv;
-    char c = (name.length() == 1) ? name.charAt(0) : CHAR_NONE;
-    return new KeyValue(name, name, c, EVENT_NONE, 0);
+    if (name.length() == 1)
+      return new KeyValue(name, KIND_CHAR, name.charAt(0), 0);
+    else
+      return new KeyValue(name, KIND_STRING, 0, 0);
   }
 
-  private static void addKey(String name, String symbol, char c, int event, int flags)
+  private static void addKey(String name, String symbol, int kind, int code, int flags)
   {
-    keys.put(name, new KeyValue(name, symbol, c, event, flags));
+    keys.put(name, new KeyValue(symbol, kind, code, flags));
   }
 
-  private static void addCharKey(char c, int event, int flags)
+  private static void addCharKey(String name, String symbol, char c, int flags)
   {
-    String name = String.valueOf(c);
-    addKey(name, name, c, event, flags);
+    addKey(name, symbol, KIND_CHAR, c, flags);
   }
 
-  private static void addCharKey(char c, int event)
+  private static void addModifierKey(String name, String symbol, Modifier m, int extra_flags)
   {
-    addCharKey(c, event, 0);
+    addKey(name, symbol, KIND_MODIFIER, m.ordinal(),
+        FLAG_LATCH | FLAG_SPECIAL | extra_flags);
   }
 
-  private static void addModifierKey(String name, String symbol, int extra_flags)
+  private static void addEventKey(String name, String symbol, Event e, int flags)
   {
-    addKey(name, symbol, CHAR_NONE, EVENT_NONE,
-        FLAG_LATCH | FLAG_NOCHAR | FLAG_NOREPEAT | extra_flags);
+    addKey(name, symbol, KIND_EVENT, e.ordinal(), flags | FLAG_SPECIAL);
   }
 
-  private static void addSpecialKey(String name, String symbol, int event)
+  private static void addKeyeventKey(String name, String symbol, int code, int flags)
   {
-    addSpecialKey(name, symbol, event, 0);
+    addKey(name, symbol, KIND_KEYEVENT, code, flags);
   }
 
-  private static void addSpecialKey(String name, String symbol, int event, int flags)
-  {
-    addKey(name, symbol, CHAR_NONE, event, flags | FLAG_NOREPEAT);
-  }
+  // Within VALUE_BITS
+  private static int placeholder_unique_id = 0;
 
-  private static void addEventKey(String name, String symbol, int event)
+  /** Use a unique id as the value because the symbol is shared between every
+      placeholders (it is the empty string). */
+  private static void addPlaceholderKey(String name)
   {
-    addEventKey(name, symbol, event, 0);
-  }
-
-  private static void addEventKey(String name, String symbol, int event, int flags)
-  {
-    addKey(name, symbol, CHAR_NONE, event, flags);
+    addKey(name, "", KIND_STRING, placeholder_unique_id++, 0);
   }
 
   static
   {
-    addModifierKey("shift", "\uE808",
-        FLAG_LOCK | FLAG_SHIFT | FLAG_KEY_FONT | FLAG_SMALLER_FONT);
-    addModifierKey("ctrl", "Ctrl", FLAG_CTRL | FLAG_SMALLER_FONT);
-    addModifierKey("alt", "Alt", FLAG_ALT | FLAG_SMALLER_FONT);
-    addModifierKey("accent_aigu", "◌́", FLAG_ACCENT2);
-    addModifierKey("accent_caron", "◌̌", FLAG_ACCENT_CARON);
-    addModifierKey("accent_cedille", "◌̧", FLAG_ACCENT5);
-    addModifierKey("accent_circonflexe", "◌̂", FLAG_ACCENT3);
-    addModifierKey("accent_grave", "◌̀", FLAG_ACCENT1);
-    addModifierKey("accent_macron", "◌̄", FLAG_ACCENT_MACRON);
-    addModifierKey("accent_tilde", "◌̃", FLAG_ACCENT4);
-    addModifierKey("accent_trema", "◌̈", FLAG_ACCENT6);
-    addModifierKey("accent_ring", "◌̊", FLAG_ACCENT_RING);
-    addModifierKey("superscript", "◌͆", FLAG_ACCENT_SUPERSCRIPT);
-    addModifierKey("subscript", "◌̺", FLAG_ACCENT_SUBSCRIPT);
-    addModifierKey("ordinal", "ºʳᵈ", FLAG_ACCENT_ORDINAL | FLAG_SMALLER_FONT);
-    addModifierKey("fn", "Fn", FLAG_FN | FLAG_SMALLER_FONT);
-    addModifierKey("meta", "◆", FLAG_META);
+    addModifierKey("shift", "\n", // Can't write u000A because Java is stupid
+        Modifier.SHIFT, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
+    addModifierKey("ctrl", "Ctrl", Modifier.CTRL, FLAG_SMALLER_FONT);
+    addModifierKey("alt", "Alt", Modifier.ALT, FLAG_SMALLER_FONT);
+    addModifierKey("accent_aigu", "\u0050", Modifier.AIGU, FLAG_KEY_FONT);
+    addModifierKey("accent_caron", "\u0051", Modifier.CARON, FLAG_KEY_FONT);
+    addModifierKey("accent_cedille", "\u0052", Modifier.CEDILLE, FLAG_KEY_FONT);
+    addModifierKey("accent_circonflexe", "\u0053", Modifier.CIRCONFLEXE, FLAG_KEY_FONT);
+    addModifierKey("accent_grave", "\u0054", Modifier.GRAVE, FLAG_KEY_FONT);
+    addModifierKey("accent_macron", "\u0055", Modifier.MACRON, FLAG_KEY_FONT);
+    addModifierKey("accent_ring", "\u0056", Modifier.RING, FLAG_KEY_FONT);
+    addModifierKey("accent_tilde", "\u0057", Modifier.TILDE, FLAG_KEY_FONT);
+    addModifierKey("accent_trema", "\u0058", Modifier.TREMA, FLAG_KEY_FONT);
+    addModifierKey("accent_ogonek", "\u0059", Modifier.OGONEK, FLAG_KEY_FONT);
+    addModifierKey("accent_dot_above", "\u005a", Modifier.DOT_ABOVE, FLAG_KEY_FONT);
+    addModifierKey("accent_double_aigu", "\u005b", Modifier.DOUBLE_AIGU, FLAG_KEY_FONT);
+    addModifierKey("accent_slash", "\134", // Can't write u005c
+        Modifier.SLASH, FLAG_KEY_FONT);
+    addModifierKey("accent_arrow_right", "\u005d", Modifier.ARROW_RIGHT, FLAG_KEY_FONT);
+    addModifierKey("superscript", "Sup", Modifier.SUPERSCRIPT, FLAG_SMALLER_FONT);
+    addModifierKey("subscript", "Sub", Modifier.SUBSCRIPT, FLAG_SMALLER_FONT);
+    addModifierKey("ordinal", "Ord", Modifier.ORDINAL, FLAG_SMALLER_FONT);
+    addModifierKey("arrows", "Arr", Modifier.ARROWS, FLAG_SMALLER_FONT);
+    addModifierKey("box", "Box", Modifier.BOX, FLAG_SMALLER_FONT);
+    addModifierKey("fn", "Fn", Modifier.FN, FLAG_SMALLER_FONT);
+    addModifierKey("meta", "Meta", Modifier.META, FLAG_SMALLER_FONT);
 
-    addCharKey('a', KeyEvent.KEYCODE_A);
-    addCharKey('b', KeyEvent.KEYCODE_B);
-    addCharKey('c', KeyEvent.KEYCODE_C);
-    addCharKey('d', KeyEvent.KEYCODE_D);
-    addCharKey('e', KeyEvent.KEYCODE_E);
-    addCharKey('f', KeyEvent.KEYCODE_F);
-    addCharKey('g', KeyEvent.KEYCODE_G);
-    addCharKey('h', KeyEvent.KEYCODE_H);
-    addCharKey('i', KeyEvent.KEYCODE_I);
-    addCharKey('j', KeyEvent.KEYCODE_J);
-    addCharKey('k', KeyEvent.KEYCODE_K);
-    addCharKey('l', KeyEvent.KEYCODE_L);
-    addCharKey('m', KeyEvent.KEYCODE_M);
-    addCharKey('n', KeyEvent.KEYCODE_N);
-    addCharKey('o', KeyEvent.KEYCODE_O);
-    addCharKey('p', KeyEvent.KEYCODE_P);
-    addCharKey('q', KeyEvent.KEYCODE_Q);
-    addCharKey('r', KeyEvent.KEYCODE_R);
-    addCharKey('s', KeyEvent.KEYCODE_S);
-    addCharKey('t', KeyEvent.KEYCODE_T);
-    addCharKey('u', KeyEvent.KEYCODE_U);
-    addCharKey('v', KeyEvent.KEYCODE_V);
-    addCharKey('w', KeyEvent.KEYCODE_W);
-    addCharKey('x', KeyEvent.KEYCODE_X);
-    addCharKey('y', KeyEvent.KEYCODE_Y);
-    addCharKey('z', KeyEvent.KEYCODE_Z);
-    addCharKey('0', KeyEvent.KEYCODE_0);
-    addCharKey('1', KeyEvent.KEYCODE_1);
-    addCharKey('2', KeyEvent.KEYCODE_2);
-    addCharKey('3', KeyEvent.KEYCODE_3);
-    addCharKey('4', KeyEvent.KEYCODE_4);
-    addCharKey('5', KeyEvent.KEYCODE_5);
-    addCharKey('6', KeyEvent.KEYCODE_6);
-    addCharKey('7', KeyEvent.KEYCODE_7);
-    addCharKey('8', KeyEvent.KEYCODE_8);
-    addCharKey('9', KeyEvent.KEYCODE_9);
-    addCharKey('`', KeyEvent.KEYCODE_GRAVE);
-    addCharKey('-', KeyEvent.KEYCODE_MINUS);
-    addCharKey('=', KeyEvent.KEYCODE_EQUALS);
-    addCharKey('[', KeyEvent.KEYCODE_LEFT_BRACKET);
-    addCharKey(']', KeyEvent.KEYCODE_RIGHT_BRACKET);
-    addCharKey('\\', KeyEvent.KEYCODE_BACKSLASH);
-    addCharKey(';', KeyEvent.KEYCODE_SEMICOLON);
-    addCharKey('\'', KeyEvent.KEYCODE_APOSTROPHE);
-    addCharKey('/', KeyEvent.KEYCODE_SLASH);
-    addCharKey('@', KeyEvent.KEYCODE_AT);
-    addCharKey('+', KeyEvent.KEYCODE_PLUS);
-    addCharKey(',', KeyEvent.KEYCODE_COMMA);
-    addCharKey('.', KeyEvent.KEYCODE_PERIOD);
-    addCharKey('*', KeyEvent.KEYCODE_STAR);
-    addCharKey('#', KeyEvent.KEYCODE_POUND);
-    addCharKey('(', KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN);
-    addCharKey(')', KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN);
-    addCharKey('ß', EVENT_NONE, FLAG_LANG_SZLIG);
-    addCharKey('€', EVENT_NONE, FLAG_LANG_EURO);
-    addCharKey('£', EVENT_NONE, FLAG_LANG_POUND);
+    addEventKey("config", "\u0004", Event.CONFIG, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
+    addEventKey("switch_text", "ABC", Event.SWITCH_TEXT, FLAG_SMALLER_FONT);
+    addEventKey("switch_numeric", "123+", Event.SWITCH_NUMERIC, FLAG_SMALLER_FONT);
+    addEventKey("switch_emoji", "\u0001" , Event.SWITCH_EMOJI, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
+    addEventKey("switch_back_emoji", "ABC", Event.SWITCH_BACK_EMOJI, 0);
+    addEventKey("switch_programming", "Prog", Event.SWITCH_PROGRAMMING, FLAG_SMALLER_FONT);
+    addEventKey("switch_greekmath", "πλ∇¬", Event.SWITCH_GREEKMATH, FLAG_SMALLER_FONT);
+    addEventKey("change_method", "\u0009", Event.CHANGE_METHOD, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
+    addEventKey("action", "Action", Event.ACTION, FLAG_SMALLER_FONT); // Will always be replaced
 
-    addSpecialKey("config", "\uE806", EVENT_CONFIG, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
-    addSpecialKey("switch_text", "ABC", EVENT_SWITCH_TEXT);
-    addSpecialKey("switch_numeric", "123+", EVENT_SWITCH_NUMERIC);
-    addSpecialKey("switch_emoji", "\uE812" , EVENT_SWITCH_EMOJI, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
-    addSpecialKey("switch_back_emoji", "ABC", EVENT_SWITCH_BACK_EMOJI);
-    addSpecialKey("change_method", "\ue807", EVENT_CHANGE_METHOD, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
-    addSpecialKey("action", "Action", EVENT_ACTION); // Will always be replaced
+    addKeyeventKey("esc", "Esc", KeyEvent.KEYCODE_ESCAPE, FLAG_SMALLER_FONT);
+    addKeyeventKey("enter", "\u000E", KeyEvent.KEYCODE_ENTER, FLAG_KEY_FONT);
+    addKeyeventKey("up", "\u0005", KeyEvent.KEYCODE_DPAD_UP, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
+    addKeyeventKey("right", "\u0006", KeyEvent.KEYCODE_DPAD_RIGHT, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
+    addKeyeventKey("down", "\u0007", KeyEvent.KEYCODE_DPAD_DOWN, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
+    addKeyeventKey("left", "\u0008", KeyEvent.KEYCODE_DPAD_LEFT, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
+    addKeyeventKey("page_up", "\u0002", KeyEvent.KEYCODE_PAGE_UP, FLAG_KEY_FONT);
+    addKeyeventKey("page_down", "\u0003", KeyEvent.KEYCODE_PAGE_DOWN, FLAG_KEY_FONT);
+    addKeyeventKey("home", "\u000B", KeyEvent.KEYCODE_MOVE_HOME, FLAG_KEY_FONT);
+    addKeyeventKey("end", "\u000C", KeyEvent.KEYCODE_MOVE_END, FLAG_KEY_FONT);
+    addKeyeventKey("backspace", "\u0011", KeyEvent.KEYCODE_DEL, FLAG_KEY_FONT);
+    addKeyeventKey("delete", "\u0010", KeyEvent.KEYCODE_FORWARD_DEL, FLAG_KEY_FONT);
+    addKeyeventKey("insert", "Ins", KeyEvent.KEYCODE_INSERT, FLAG_SMALLER_FONT);
+    addKeyeventKey("f1", "F1", KeyEvent.KEYCODE_F1, 0);
+    addKeyeventKey("f2", "F2", KeyEvent.KEYCODE_F2, 0);
+    addKeyeventKey("f3", "F3", KeyEvent.KEYCODE_F3, 0);
+    addKeyeventKey("f4", "F4", KeyEvent.KEYCODE_F4, 0);
+    addKeyeventKey("f5", "F5", KeyEvent.KEYCODE_F5, 0);
+    addKeyeventKey("f6", "F6", KeyEvent.KEYCODE_F6, 0);
+    addKeyeventKey("f7", "F7", KeyEvent.KEYCODE_F7, 0);
+    addKeyeventKey("f8", "F8", KeyEvent.KEYCODE_F8, 0);
+    addKeyeventKey("f9", "F9", KeyEvent.KEYCODE_F9, 0);
+    addKeyeventKey("f10", "F10", KeyEvent.KEYCODE_F10, 0);
+    addKeyeventKey("f11", "F11", KeyEvent.KEYCODE_F11, FLAG_SMALLER_FONT);
+    addKeyeventKey("f12", "F12", KeyEvent.KEYCODE_F12, FLAG_SMALLER_FONT);
+    addKeyeventKey("tab", "\u000F", KeyEvent.KEYCODE_TAB, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
 
-    addEventKey("esc", "Esc", KeyEvent.KEYCODE_ESCAPE, FLAG_SMALLER_FONT);
-    addEventKey("enter", "\ue800", KeyEvent.KEYCODE_ENTER, FLAG_KEY_FONT);
-    addEventKey("up", "\uE80B", KeyEvent.KEYCODE_DPAD_UP, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
-    addEventKey("right", "\uE80C", KeyEvent.KEYCODE_DPAD_RIGHT, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
-    addEventKey("down", "\uE809", KeyEvent.KEYCODE_DPAD_DOWN, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
-    addEventKey("left", "\uE80A", KeyEvent.KEYCODE_DPAD_LEFT, FLAG_KEY_FONT | FLAG_PRECISE_REPEAT);
-    addEventKey("page_up", "\uE810", KeyEvent.KEYCODE_PAGE_UP, FLAG_KEY_FONT);
-    addEventKey("page_down", "\uE811", KeyEvent.KEYCODE_PAGE_DOWN, FLAG_KEY_FONT);
-    addEventKey("home", "\uE80E", KeyEvent.KEYCODE_MOVE_HOME, FLAG_KEY_FONT);
-    addEventKey("end", "\uE80F", KeyEvent.KEYCODE_MOVE_END, FLAG_KEY_FONT);
-    addEventKey("backspace", "⌫", KeyEvent.KEYCODE_DEL, FLAG_SMALLER_FONT);
-    addEventKey("delete", "⌦", KeyEvent.KEYCODE_FORWARD_DEL, FLAG_SMALLER_FONT);
-    addEventKey("insert", "Ins", KeyEvent.KEYCODE_INSERT, FLAG_SMALLER_FONT);
-    addEventKey("f1", "F1", KeyEvent.KEYCODE_F1);
-    addEventKey("f2", "F2", KeyEvent.KEYCODE_F2);
-    addEventKey("f3", "F3", KeyEvent.KEYCODE_F3);
-    addEventKey("f4", "F4", KeyEvent.KEYCODE_F4);
-    addEventKey("f5", "F5", KeyEvent.KEYCODE_F5);
-    addEventKey("f6", "F6", KeyEvent.KEYCODE_F6);
-    addEventKey("f7", "F7", KeyEvent.KEYCODE_F7);
-    addEventKey("f8", "F8", KeyEvent.KEYCODE_F8);
-    addEventKey("f9", "F9", KeyEvent.KEYCODE_F9);
-    addEventKey("f10", "F10", KeyEvent.KEYCODE_F10);
-    addEventKey("tab", "↹", KeyEvent.KEYCODE_TAB);
+    addCharKey("\\t", "\\t", '\t', 0); // Send the tab character
+    addCharKey("space", "\r", ' ', FLAG_KEY_FONT);
+    addCharKey("nbsp", "\u237d", '\u00a0', FLAG_KEY_FONT | FLAG_SMALLER_FONT);
 
-    addKey("\\t", "\\t", '\t', EVENT_NONE, 0); // Send the tab character
-    addKey("space", "\ue80d", ' ', KeyEvent.KEYCODE_SPACE, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
+    addPlaceholderKey("removed");
+    addPlaceholderKey("f11_placeholder");
+    addPlaceholderKey("f12_placeholder");
+  }
+
+  // Substitute for [assert], which has no effect on Android.
+  private static void check(boolean b)
+  {
+    if (!b)
+      throw new RuntimeException("Assertion failure");
   }
 }

srcs/juloo.keyboard2/Keyboard2.java

@@ -18,16 +18,27 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+import android.util.Log;
+import android.util.LogPrinter;
+import java.util.Arrays;
 import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Keyboard2 extends InputMethodService
-  implements SharedPreferences.OnSharedPreferenceChangeListener
+  implements SharedPreferences.OnSharedPreferenceChangeListener,
+             Autocapitalisation.Callback
 {
+  static private final String TAG = "Keyboard2";
+
   private Keyboard2View _keyboardView;
   private int _currentTextLayout;
   private ViewGroup _emojiPane = null;
 
   private Config _config;
+  private Autocapitalisation _autocap = new Autocapitalisation();
+
+  private boolean _debug_logs = false;
 
   private KeyboardData getLayout(int resId)
   {
@@ -45,6 +56,15 @@ public class Keyboard2 extends InputMethodService
     _config.refresh(this);
     _keyboardView = (Keyboard2View)inflate_view(R.layout.keyboard);
     _keyboardView.reset();
+    _debug_logs = getResources().getBoolean(R.bool.debug_logs);
+  }
+
+  public void update_shift_state(boolean should_enable, boolean should_disable)
+  {
+    if (should_enable)
+      _keyboardView.set_shift_state(true);
+    else if (should_disable)
+      _keyboardView.set_shift_state(false);
   }
 
   private List<InputMethodSubtype> getEnabledSubtypes(InputMethodManager imm)
@@ -53,7 +73,7 @@ public class Keyboard2 extends InputMethodService
     for (InputMethodInfo imi : imm.getEnabledInputMethodList())
       if (imi.getPackageName().equals(pkg))
         return imm.getEnabledInputMethodSubtypeList(imi, true);
-    return null;
+    return Arrays.asList();
   }
 
   private void refreshSubtypeLayout(InputMethodSubtype subtype)
@@ -70,32 +90,37 @@ public class Keyboard2 extends InputMethodService
     _currentTextLayout = l;
   }
 
-  private int extra_keys_of_subtype(InputMethodSubtype subtype)
+  private void extra_keys_of_subtype(Set<KeyValue> dst, InputMethodSubtype subtype)
   {
     String extra_keys = subtype.getExtraValueOf("extra_keys");
-    int flags = 0;
-    if (extra_keys != null)
-      for (String acc : extra_keys.split("\\|"))
-        flags |= Config.extra_key_flag_of_name(acc);
-    return flags;
+    if (extra_keys == null)
+      return;
+    String[] ks = extra_keys.split("\\|");
+    for (int i = 0; i < ks.length; i++)
+      dst.add(KeyValue.getKeyByName(ks[i]));
   }
 
   private void refreshAccentsOption(InputMethodManager imm, InputMethodSubtype subtype)
   {
-    int to_keep = 0;
+    HashSet<KeyValue> extra_keys = new HashSet<KeyValue>();
+    List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm);
     switch (_config.accents)
     {
-      case 1:
-        to_keep |= extra_keys_of_subtype(subtype);
-        for (InputMethodSubtype s : getEnabledSubtypes(imm))
-          to_keep |= extra_keys_of_subtype(s);
+      // '3' was "all accents", now unused
+      case 1: case 3:
+        extra_keys_of_subtype(extra_keys, subtype);
+        for (InputMethodSubtype s : enabled_subtypes)
+          extra_keys_of_subtype(extra_keys, s);
+        break;
+      case 2:
+        extra_keys_of_subtype(extra_keys, subtype);
         break;
-      case 2: to_keep |= extra_keys_of_subtype(subtype); break;
-      case 3: to_keep = KeyValue.FLAGS_HIDDEN_KEYS; break;
       case 4: break;
       default: throw new IllegalArgumentException();
     }
-    _config.key_flags_to_remove = ~to_keep & KeyValue.FLAGS_HIDDEN_KEYS;
+    _config.extra_keys_subtype = extra_keys;
+    if (enabled_subtypes.size() > 1)
+      _config.shouldOfferSwitchingToNextInputMethod = true;
   }
 
   private void refreshSubtypeLegacyFallback()
@@ -103,8 +128,8 @@ public class Keyboard2 extends InputMethodService
     // Fallback for the accents option: Only respect the "None" case
     switch (_config.accents)
     {
-      case 1: case 2: case 3: _config.key_flags_to_remove = 0; break;
-      case 4: _config.key_flags_to_remove = KeyValue.FLAGS_HIDDEN_KEYS; break;
+      case 1: case 2: case 3: _config.extra_keys_subtype = null; break;
+      case 4: _config.extra_keys_subtype = new HashSet<KeyValue>(); break;
     }
     // Fallback for the layout option: Use qwerty in the "system settings" case
     _currentTextLayout = (_config.layout == -1) ? R.xml.qwerty : _config.layout;
@@ -125,6 +150,9 @@ public class Keyboard2 extends InputMethodService
       refreshSubtypeLayout(subtype);
       refreshAccentsOption(imm, subtype);
     }
+    _config.shouldOfferSwitchingToProgramming =
+      _config.programming_layout != -1 &&
+      _currentTextLayout != _config.programming_layout;
   }
 
   private String actionLabel_of_imeAction(int action)
@@ -145,7 +173,7 @@ public class Keyboard2 extends InputMethodService
     return getResources().getString(res);
   }
 
-  private void refreshEditorInfo(EditorInfo info)
+  private void refresh_action_label(EditorInfo info)
   {
     // First try to look at 'info.actionLabel', if it isn't set, look at
     // 'imeOptions'.
@@ -176,17 +204,31 @@ public class Keyboard2 extends InputMethodService
       _keyboardView = (Keyboard2View)inflate_view(R.layout.keyboard);
       _emojiPane = null;
     }
-    _keyboardView.setKeyboard(getLayout(_currentTextLayout));
+  }
+
+  private void log_editor_info(EditorInfo info)
+  {
+    LogPrinter p = new LogPrinter(Log.DEBUG, TAG);
+    info.dump(p, "");
+    if (info.extras != null)
+      Log.d(TAG, "extras: "+info.extras.toString());
+    Log.d(TAG, "swapEnterActionKey: "+_config.swapEnterActionKey);
+    Log.d(TAG, "actionLabel: "+_config.actionLabel);
   }
 
   @Override
   public void onStartInputView(EditorInfo info, boolean restarting)
   {
     refreshConfig();
-    refreshEditorInfo(info);
+    refresh_action_label(info);
     if ((info.inputType & InputType.TYPE_CLASS_NUMBER) != 0)
       _keyboardView.setKeyboard(getLayout(R.xml.numeric));
+    else
+      _keyboardView.setKeyboard(getLayout(_currentTextLayout));
+    _autocap.started(getMainLooper(), this, info, getCurrentInputConnection());
     setInputView(_keyboardView);
+    if (_debug_logs)
+      log_editor_info(info);
   }
 
   @Override
@@ -205,6 +247,13 @@ public class Keyboard2 extends InputMethodService
     _keyboardView.setKeyboard(getLayout(_currentTextLayout));
   }
 
+  @Override
+  public void onUpdateSelection(int oldSelStart, int oldSelEnd, int newSelStart, int newSelEnd, int candidatesStart, int candidatesEnd)
+  {
+    super.onUpdateSelection(oldSelStart, oldSelEnd, newSelStart, newSelEnd, candidatesStart, candidatesEnd);
+    _autocap.selection_updated(oldSelStart, newSelStart);
+  }
+
   @Override
   public void onFinishInputView(boolean finishingInput)
   {
@@ -249,11 +298,36 @@ public class Keyboard2 extends InputMethodService
       conn.performEditorAction(_config.actionId);
     }
 
-    public void setLayout(int res_id)
+    public void switchMain()
     {
-      if (res_id == -1)
-        res_id = _currentTextLayout;
-      _keyboardView.setKeyboard(getLayout(res_id));
+      _keyboardView.setKeyboard(getLayout(_currentTextLayout));
+    }
+
+    public void switchNumeric()
+    {
+      _keyboardView.setKeyboard(getLayout(R.xml.numeric));
+    }
+
+    public void switchGreekmath()
+    {
+      _keyboardView.setKeyboard(getLayout(R.xml.greekmath));
+    }
+
+    public void switchProgramming()
+    {
+      if (_config.programming_layout == -1)
+        return;
+      KeyboardData layout =
+        getLayout(_config.programming_layout).mapKeys(new KeyboardData.MapKeyValues() {
+          public KeyValue apply(KeyValue key, boolean localized)
+          {
+            if (key.getKind() == KeyValue.Kind.Event
+                && key.getEvent() == KeyValue.Event.SWITCH_PROGRAMMING)
+              return KeyValue.getKeyByName("switch_text");
+            return key;
+          }
+        });
+      _keyboardView.setKeyboard(layout);
     }
 
     public void sendKeyEvent(int eventAction, int eventCode, int meta)
@@ -262,6 +336,8 @@ public class Keyboard2 extends InputMethodService
       if (conn == null)
         return;
       conn.sendKeyEvent(new KeyEvent(1, 1, eventAction, eventCode, 0, meta));
+      if (eventAction == KeyEvent.ACTION_UP)
+        _autocap.event_sent(eventCode);
     }
 
     public void showKeyboardConfig()
@@ -274,11 +350,13 @@ public class Keyboard2 extends InputMethodService
     public void commitText(String text)
     {
       getCurrentInputConnection().commitText(text, 1);
+      _autocap.typed(text);
     }
 
     public void commitChar(char c)
     {
       sendKeyChar(c);
+      _autocap.typed(c);
     }
   }
 

srcs/juloo.keyboard2/Keyboard2View.java

@@ -1,29 +1,30 @@
 package juloo.keyboard2;
 
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.os.Vibrator;
+import android.inputmethodservice.InputMethodService;
+import android.os.Build.VERSION;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.Window;
 
 public class Keyboard2View extends View
   implements View.OnTouchListener, Pointers.IPointerEventHandler
 {
-  private static final long VIBRATE_MIN_INTERVAL = 100;
-
   private KeyboardData _keyboard;
+  private KeyValue _shift_kv;
+  private KeyboardData.Key _shift_key;
 
   private Pointers _pointers;
 
-  private int _flags = 0;
-
-  private Vibrator _vibratorService;
-  private long _lastVibration = 0;
+  private Pointers.Modifiers _mods;
 
   private static int _currentWhat = 0;
 
@@ -45,88 +46,103 @@ public class Keyboard2View extends View
   public Keyboard2View(Context context, AttributeSet attrs)
   {
     super(context, attrs);
-    _vibratorService = (Vibrator)context.getSystemService(Context.VIBRATOR_SERVICE);
     _theme = new Theme(getContext(), attrs);
     _config = Config.globalConfig();
     _pointers = new Pointers(this, _config);
+    refresh_navigation_bar(context);
     setOnTouchListener(this);
     reset();
   }
 
+  private Window getParentWindow(Context context)
+  {
+    if (context instanceof InputMethodService)
+      return ((InputMethodService)context).getWindow().getWindow();
+    if (context instanceof ContextWrapper)
+      return getParentWindow(((ContextWrapper)context).getBaseContext());
+    return null;
+  }
+
+  public void refresh_navigation_bar(Context context)
+  {
+    if (VERSION.SDK_INT < 21)
+      return;
+    // The intermediate Window is a [Dialog].
+    Window w = getParentWindow(context);
+    int uiFlags = getSystemUiVisibility();
+    if (_theme.isLightNavBar)
+      uiFlags |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+    else
+      uiFlags &= ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+    w.setNavigationBarColor(_theme.colorNavBar);
+    setSystemUiVisibility(uiFlags);
+  }
+
   public void setKeyboard(KeyboardData kw)
   {
-    if (!_config.shouldOfferSwitchingToNextInputMethod)
-      kw = kw.replaceKeys(
-          new KeyboardData.ReplaceKeysByEvent(KeyValue.EVENT_CHANGE_METHOD, null));
-    if (_config.key_flags_to_remove != 0)
-      kw = kw.replaceKeys(
-          new KeyboardData.ReplaceKeysByFlags(_config.key_flags_to_remove, null));
-    // Replace the action key to show the right label.
-    KeyValue action_key = null; 
-    if (_config.actionLabel != null)
+    _keyboard = _config.modify_layout(kw);
+    _shift_kv = KeyValue.getKeyByName("shift");
+    _shift_key = _keyboard.findKeyWithValue(_shift_kv);
+    if (_shift_key == null)
     {
-      action_key = new KeyValue(_config.actionLabel, _config.actionLabel,
-          KeyValue.CHAR_NONE, KeyValue.EVENT_ACTION, KeyValue.FLAG_NOREPEAT);
+      _shift_kv = _shift_kv.withFlags(_shift_kv.getFlags() | KeyValue.FLAG_LOCK);
+      _shift_key = _keyboard.findKeyWithValue(_shift_kv);
     }
-    if (_config.swapEnterActionKey && action_key != null)
-      kw = kw.replaceKeys(
-          new KeyboardData.ReplaceKeysByEvent2(KeyEvent.KEYCODE_ENTER,
-            action_key, KeyValue.EVENT_ACTION,
-            KeyValue.getKeyByName("enter")));
-    else
-      kw = kw.replaceKeys(
-          new KeyboardData.ReplaceKeysByEvent(KeyValue.EVENT_ACTION, action_key));
-    _keyboard = kw;
     reset();
   }
 
   public void reset()
   {
-    _flags = 0;
+    _mods = Pointers.Modifiers.EMPTY;
     _pointers.clear();
     requestLayout();
     invalidate();
   }
 
-  public void onPointerDown(KeyValue k)
+  /** Called by auto-capitalisation. */
+  public void set_shift_state(boolean state)
   {
-    updateFlags();
+    if (_keyboard == null || _shift_key == null)
+      return;
+    if (state)
+      _pointers.add_fake_pointer(_shift_kv, _shift_key);
+    else
+      _pointers.remove_fake_pointer(_shift_kv, _shift_key);
     invalidate();
-    if (k != null)
+  }
+
+  public KeyValue modifyKey(KeyValue k, Pointers.Modifiers mods)
+  {
+    return KeyModifier.modify(k, mods);
+  }
+
+  public void onPointerDown(boolean isSwipe)
+  {
+    invalidate();
+    vibrate();
+  }
+
+  public void onPointerUp(KeyValue k, Pointers.Modifiers mods)
+  {
+    _config.handler.handleKeyUp(k, mods);
+    invalidate();
+  }
+
+  public void onPointerHold(KeyValue k, Pointers.Modifiers mods)
+  {
+    _config.handler.handleKeyUp(k, mods);
+  }
+
+  public void onPointerFlagsChanged(boolean shouldVibrate)
+  {
+    invalidate();
+    if (shouldVibrate)
       vibrate();
   }
 
-  public void onPointerSwipe(KeyValue k)
-  {
-    updateFlags();
-    invalidate();
-    if (k != null)
-      vibrate();
-  }
-
-  public void onPointerUp(KeyValue k)
-  {
-    if (k != null && (k.flags & KeyValue.FLAG_NOCHAR) == 0)
-      _config.handler.handleKeyUp(k, _flags);
-    updateFlags();
-    invalidate();
-  }
-
-  public void onPointerHold(KeyValue k)
-  {
-    if (k != null)
-      _config.handler.handleKeyUp(k, _flags);
-  }
-
-  public void onPointerFlagsChanged()
-  {
-    updateFlags();
-    invalidate();
-  }
-
   private void updateFlags()
   {
-    _flags = _pointers.getFlags();
+    _mods = _pointers.getModifiers();
   }
 
   @Override
@@ -138,7 +154,7 @@ public class Keyboard2View extends View
       case MotionEvent.ACTION_UP:
       case MotionEvent.ACTION_POINTER_UP:
         _pointers.onTouchUp(event.getPointerId(event.getActionIndex()));
-        break ;
+        break;
       case MotionEvent.ACTION_DOWN:
       case MotionEvent.ACTION_POINTER_DOWN:
         p = event.getActionIndex();
@@ -147,11 +163,14 @@ public class Keyboard2View extends View
         KeyboardData.Key key = getKeyAtPosition(tx, ty);
         if (key != null)
           _pointers.onTouchDown(tx, ty, event.getPointerId(p), key);
-        break ;
+        break;
       case MotionEvent.ACTION_MOVE:
         for (p = 0; p < event.getPointerCount(); p++)
           _pointers.onTouchMove(event.getX(p), event.getY(p), event.getPointerId(p));
-        break ;
+        break;
+      case MotionEvent.ACTION_CANCEL:
+        _pointers.onTouchCancel(event.getPointerId(event.getActionIndex()));
+        break;
       default:
         return (false);
     }
@@ -191,18 +210,10 @@ public class Keyboard2View extends View
   {
     if (!_config.vibrateEnabled)
       return ;
-    long now = System.currentTimeMillis();
-    if ((now - _lastVibration) > VIBRATE_MIN_INTERVAL)
+    if (VERSION.SDK_INT >= 5)
     {
-      _lastVibration = now;
-      try
-      {
-        _vibratorService.vibrate(_config.vibrateDuration);
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
+      performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
+          HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
     }
   }
 
@@ -222,6 +233,7 @@ public class Keyboard2View extends View
   @Override
   protected void onDraw(Canvas canvas)
   {
+    updateFlags();
     float y = _config.marginTop + _config.keyVerticalInterval / 2;
     for (KeyboardData.Row row : _keyboard.rows)
     {
@@ -236,29 +248,20 @@ public class Keyboard2View extends View
         _tmpRect.set(x, y, x + keyW, y + keyH);
         canvas.drawRoundRect(_tmpRect, _theme.keyBorderRadius, _theme.keyBorderRadius,
             isKeyDown ? _theme.keyDownBgPaint : _theme.keyBgPaint);
-        if (k.key0 != null)
-          drawLabel(canvas, k.key0, keyW / 2f + x, y, keyH, isKeyDown);
+        drawLabel(canvas, k.key0, keyW / 2f + x, y, keyH, isKeyDown);
         if (k.edgekeys)
         {
-          if (k.key1 != null) // top key
-            drawSubLabel(canvas, k.key1, x, y, keyW, keyH, Paint.Align.CENTER, Vertical.TOP, isKeyDown);
-          if (k.key3 != null) // left key
-            drawSubLabel(canvas, k.key3, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.CENTER, isKeyDown);
-          if (k.key2 != null) // right key
-            drawSubLabel(canvas, k.key2, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.CENTER, isKeyDown);
-          if (k.key4 != null) // bottom key
-            drawSubLabel(canvas, k.key4, x, y, keyW, keyH, Paint.Align.CENTER, Vertical.BOTTOM, isKeyDown);
+          drawSubLabel(canvas, k.key1, x, y, keyW, keyH, Paint.Align.CENTER, Vertical.TOP, isKeyDown);
+          drawSubLabel(canvas, k.key3, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.CENTER, isKeyDown);
+          drawSubLabel(canvas, k.key2, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.CENTER, isKeyDown);
+          drawSubLabel(canvas, k.key4, x, y, keyW, keyH, Paint.Align.CENTER, Vertical.BOTTOM, isKeyDown);
         }
         else
         {
-          if (k.key1 != null) // top left key
-            drawSubLabel(canvas, k.key1, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.TOP, isKeyDown);
-          if (k.key3 != null) // bottom left key
-            drawSubLabel(canvas, k.key3, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.BOTTOM, isKeyDown);
-          if (k.key2 != null) // top right key
-            drawSubLabel(canvas, k.key2, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.TOP, isKeyDown);
-          if (k.key4 != null) // bottom right key
-            drawSubLabel(canvas, k.key4, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.BOTTOM, isKeyDown);
+          drawSubLabel(canvas, k.key1, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.TOP, isKeyDown);
+          drawSubLabel(canvas, k.key3, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.BOTTOM, isKeyDown);
+          drawSubLabel(canvas, k.key2, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.TOP, isKeyDown);
+          drawSubLabel(canvas, k.key4, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.BOTTOM, isKeyDown);
         }
         x += _keyWidth * k.width;
       }
@@ -274,7 +277,7 @@ public class Keyboard2View extends View
 
   private int labelColor(KeyValue k, boolean isKeyDown, int defaultColor)
   {
-    if (isKeyDown && (k.flags & KeyValue.FLAG_LATCH) != 0)
+    if (isKeyDown && k.hasFlags(KeyValue.FLAG_LATCH))
     {
       int flags = _pointers.getKeyFlags(k);
       if (flags != -1)
@@ -288,22 +291,30 @@ public class Keyboard2View extends View
     return defaultColor;
   }
 
-  private void drawLabel(Canvas canvas, KeyValue k, float x, float y, float keyH, boolean isKeyDown)
+  private void drawLabel(Canvas canvas, KeyboardData.Corner k, float x, float y, float keyH, boolean isKeyDown)
   {
-    float textSize = scaleTextSize(k, _config.labelTextSize, keyH);
-    k = KeyModifier.handleFlags(k, _flags);
-    Paint p = _theme.labelPaint(((k.flags & KeyValue.FLAG_KEY_FONT) != 0));
-    p.setColor(labelColor(k, isKeyDown, _theme.labelColor));
+    if (k == null)
+      return;
+    KeyValue kv = KeyModifier.modify(k.kv, _mods);
+    if (kv == null)
+      return;
+    float textSize = scaleTextSize(kv, _config.labelTextSize, keyH);
+    Paint p = _theme.labelPaint(kv.hasFlags(KeyValue.FLAG_KEY_FONT));
+    p.setColor(labelColor(kv, isKeyDown, _theme.labelColor));
     p.setTextSize(textSize);
-    canvas.drawText(k.symbol, x, (keyH - p.ascent() - p.descent()) / 2f + y, p);
+    canvas.drawText(kv.getString(), x, (keyH - p.ascent() - p.descent()) / 2f + y, p);
   }
 
-  private void drawSubLabel(Canvas canvas, KeyValue k, float x, float y, float keyW, float keyH, Paint.Align a, Vertical v, boolean isKeyDown)
+  private void drawSubLabel(Canvas canvas, KeyboardData.Corner k, float x, float y, float keyW, float keyH, Paint.Align a, Vertical v, boolean isKeyDown)
   {
-    float textSize = scaleTextSize(k, _config.sublabelTextSize, keyH);
-    k = KeyModifier.handleFlags(k, _flags);
-    Paint p = _theme.subLabelPaint(((k.flags & KeyValue.FLAG_KEY_FONT) != 0), a);
-    p.setColor(labelColor(k, isKeyDown, _theme.subLabelColor));
+    if (k == null)
+      return;
+    KeyValue kv = KeyModifier.modify(k.kv, _mods);
+    if (kv == null)
+      return;
+    float textSize = scaleTextSize(kv, _config.sublabelTextSize, keyH);
+    Paint p = _theme.subLabelPaint(kv.hasFlags(KeyValue.FLAG_KEY_FONT), a);
+    p.setColor(labelColor(kv, isKeyDown, _theme.subLabelColor));
     p.setTextSize(textSize);
     float subPadding = _config.keyPadding;
     if (v == Vertical.CENTER)
@@ -314,12 +325,12 @@ public class Keyboard2View extends View
       x += keyW / 2f;
     else
       x += (a == Paint.Align.LEFT) ? subPadding : keyW - subPadding;
-    canvas.drawText(k.symbol, x, y, p);
+    canvas.drawText(kv.getString(), x, y, p);
   }
 
   private float scaleTextSize(KeyValue k, float rel_size, float keyH)
   {
-    float smaller_font = ((k.flags & KeyValue.FLAG_SMALLER_FONT) == 0) ? 1.f : 0.75f;
+    float smaller_font = k.hasFlags(KeyValue.FLAG_SMALLER_FONT) ? 0.75f : 1.f;
     return keyH * rel_size * smaller_font * _config.characterSize;
   }
 }

srcs/juloo.keyboard2/KeyboardData.java

@@ -3,24 +3,75 @@ package juloo.keyboard2;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import java.util.ArrayList;
+import java.util.function.Function;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 class KeyboardData
 {
   public final List<Row> rows;
-  /* Total width of the keyboard. Unit is abstract. */
+  /** Total width of the keyboard. */
   public final float keysWidth;
-  /* Total height of the keyboard. Unit is abstract. */
+  /** Total height of the keyboard. */
   public final float keysHeight;
+  /** Whether to add extra keys. */
+  public final boolean extra_keys;
 
-  public KeyboardData replaceKeys(MapKeys f)
+  public KeyboardData mapKeys(MapKey f)
   {
     ArrayList<Row> rows_ = new ArrayList<Row>();
     for (Row r : rows)
-      rows_.add(r.replaceKeys(f));
-    return new KeyboardData(rows_, keysWidth);
+      rows_.add(r.mapKeys(f));
+    return new KeyboardData(rows_, keysWidth, extra_keys);
+  }
+
+  /** Add keys from the given iterator into the keyboard. Extra keys are added
+   * on the empty key4 corner of the second row, from right to left. If there's
+   * not enough room, key3 of the second row is tried then key2 and key1 of the
+   * third row. */
+  public KeyboardData addExtraKeys(Iterator<KeyValue> k)
+  {
+    if (!extra_keys)
+      return this;
+    ArrayList<Row> rows = new ArrayList<Row>(this.rows);
+    addExtraKeys_to_row(rows, k, 1, 4);
+    addExtraKeys_to_row(rows, k, 1, 3);
+    addExtraKeys_to_row(rows, k, 2, 2);
+    addExtraKeys_to_row(rows, k, 2, 1);
+    if (k.hasNext())
+    {
+      for (int r = 0; r < rows.size(); r++)
+        for (int c = 1; c <= 4; c++)
+          addExtraKeys_to_row(rows, k, r, c);
+    }
+    return new KeyboardData(rows, keysWidth, extra_keys);
+  }
+
+  public Key findKeyWithValue(KeyValue kv)
+  {
+    for (Row r : rows)
+    {
+      Key k = r.findKeyWithValue(kv);
+      if (k != null)
+        return k;
+    }
+    return null;
+  }
+
+  private static void addExtraKeys_to_row(ArrayList<Row> rows, final Iterator<KeyValue> extra_keys, int row_i, final int d)
+  {
+    if (!extra_keys.hasNext())
+      return;
+    rows.set(row_i, rows.get(row_i).mapKeys(new MapKey(){
+      public Key apply(Key k) {
+        if (k.getKeyValue(d) == null && extra_keys.hasNext())
+          return k.withKeyValue(d, extra_keys.next());
+        else
+          return k;
+      }
+    }));
   }
 
   private static Row _bottomRow = null;
@@ -51,13 +102,14 @@ class KeyboardData
     if (!expect_tag(parser, "keyboard"))
       throw new Exception("Empty layout file");
     boolean bottom_row = parser.getAttributeBooleanValue(null, "bottom_row", true);
+    boolean extra_keys = parser.getAttributeBooleanValue(null, "extra_keys", true);
     ArrayList<Row> rows = new ArrayList<Row>();
     while (expect_tag(parser, "row"))
         rows.add(Row.parse(parser));
     float kw = compute_max_width(rows);
     if (bottom_row)
       rows.add(_bottomRow.updateWidth(kw));
-    return new KeyboardData(rows, kw);
+    return new KeyboardData(rows, kw, extra_keys);
   }
 
   private static float compute_max_width(List<Row> rows)
@@ -75,7 +127,7 @@ class KeyboardData
     return Row.parse(parser);
   }
 
-  protected KeyboardData(List<Row> rows_, float kw)
+  protected KeyboardData(List<Row> rows_, float kw, boolean xk)
   {
     float kh = 0.f;
     for (Row r : rows_)
@@ -83,16 +135,17 @@ class KeyboardData
     rows = rows_;
     keysWidth = kw;
     keysHeight = kh;
+    extra_keys = xk;
   }
 
   public static class Row
   {
     public final List<Key> keys;
-    /* Height of the row, without 'shift'. Unit is abstract. */
+    /** Height of the row, without 'shift'. */
     public final float height;
-    /* Extra empty space on the top. */
+    /** Extra empty space on the top. */
     public final float shift;
-    /* Total width of the row. Unit is abstract. */
+    /** Total width of the row. */
     private final float keysWidth;
 
     protected Row(List<Key> keys_, float h, float s)
@@ -116,22 +169,29 @@ class KeyboardData
       return new Row(keys, h, shift);
     }
 
-    public Row replaceKeys(MapKeys f)
+    public Row mapKeys(MapKey f)
     {
       ArrayList<Key> keys_ = new ArrayList<Key>();
       for (Key k : keys)
-        keys_.add(k.replaceKeys(f));
+        keys_.add(f.apply(k));
       return new Row(keys_, height, shift);
     }
 
     /** Change the width of every keys so that the row is 's' units wide. */
     public Row updateWidth(float newWidth)
     {
-      float s = newWidth / keysWidth;
-      ArrayList<Key> keys_ = new ArrayList<Key>();
+      final float s = newWidth / keysWidth;
+      return mapKeys(new MapKey(){
+        public Key apply(Key k) { return k.scaleWidth(s); }
+      });
+    }
+
+    public Key findKeyWithValue(KeyValue kv)
+    {
       for (Key k : keys)
-        keys_.add(k.scaleWidth(s));
-      return new Row(keys_, height, shift);
+        if (k.hasValue(kv))
+          return k;
+      return null;
     }
   }
 
@@ -142,20 +202,20 @@ class KeyboardData
      **   0
      ** 3   4
      */
-    public final KeyValue key0;
-    public final KeyValue key1;
-    public final KeyValue key2;
-    public final KeyValue key3;
-    public final KeyValue key4;
+    public final Corner key0;
+    public final Corner key1;
+    public final Corner key2;
+    public final Corner key3;
+    public final Corner key4;
 
-    /* Key width in relative unit. */
+    /** Key width in relative unit. */
     public final float width;
-    /* Extra empty space on the left of the key. */
+    /** Extra empty space on the left of the key. */
     public final float shift;
-    /* Put keys 1 to 4 on the edges instead of the corners. */
+    /** Put keys 1 to 4 on the edges instead of the corners. */
     public final boolean edgekeys;
 
-    protected Key(KeyValue k0, KeyValue k1, KeyValue k2, KeyValue k3, KeyValue k4, float w, float s, boolean e)
+    protected Key(Corner k0, Corner k1, Corner k2, Corner k3, Corner k4, float w, float s, boolean e)
     {
       key0 = k0;
       key1 = k1;
@@ -169,11 +229,11 @@ class KeyboardData
 
     public static Key parse(XmlResourceParser parser) throws Exception
     {
-      KeyValue k0 = KeyValue.getKeyByName(parser.getAttributeValue(null, "key0"));
-      KeyValue k1 = KeyValue.getKeyByName(parser.getAttributeValue(null, "key1"));
-      KeyValue k2 = KeyValue.getKeyByName(parser.getAttributeValue(null, "key2"));
-      KeyValue k3 = KeyValue.getKeyByName(parser.getAttributeValue(null, "key3"));
-      KeyValue k4 = KeyValue.getKeyByName(parser.getAttributeValue(null, "key4"));
+      Corner k0 = Corner.parse_of_attr(parser, "key0");
+      Corner k1 = Corner.parse_of_attr(parser, "key1");
+      Corner k2 = Corner.parse_of_attr(parser, "key2");
+      Corner k3 = Corner.parse_of_attr(parser, "key3");
+      Corner k4 = Corner.parse_of_attr(parser, "key4");
       float width = parser.getAttributeFloatValue(null, "width", 1f);
       float shift = parser.getAttributeFloatValue(null, "shift", 0.f);
       boolean edgekeys = parser.getAttributeBooleanValue(null, "edgekeys", false);
@@ -182,80 +242,158 @@ class KeyboardData
       return new Key(k0, k1, k2, k3, k4, width, shift, edgekeys);
     }
 
-    public Key replaceKeys(MapKeys f)
-    {
-      return new Key(f.map(key0), f.map(key1), f.map(key2), f.map(key3), f.map(key4), width, shift, edgekeys);
-    }
-
     /** New key with the width multiplied by 's'. */
     public Key scaleWidth(float s)
     {
       return new Key(key0, key1, key2, key3, key4, width * s, shift, edgekeys);
     }
-  }
 
-  public static abstract interface MapKeys
-  {
-    public abstract KeyValue map(KeyValue k);
-  }
-
-  public static class ReplaceKeysByFlags implements MapKeys
-  {
-    private final int _flags;
-    private final KeyValue _replacement;
-
-    public ReplaceKeysByFlags(int flags, KeyValue r)
+    public KeyValue getKeyValue(int i)
     {
-      _flags = flags;
-      _replacement = r;
+      Corner c;
+      switch (i)
+      {
+        case 0: c = key0; break;
+        case 1: c = key1; break;
+        case 2: c = key2; break;
+        case 3: c = key3; break;
+        case 4: c = key4; break;
+        default: c = null; break;
+      }
+      return (c == null) ? null : c.kv;
     }
 
-    public KeyValue map(KeyValue k)
+    public Key withKeyValue(int i, KeyValue kv)
     {
-      return (k != null && (k.flags & _flags) != 0) ? _replacement : k;
+      Corner k0 = key0, k1 = key1, k2 = key2, k3 = key3, k4 = key4;
+      Corner k = Corner.of_kv(kv);
+      switch (i)
+      {
+        case 0: k0 = k; break;
+        case 1: k1 = k; break;
+        case 2: k2 = k; break;
+        case 3: k3 = k; break;
+        case 4: k4 = k; break;
+      }
+      return new Key(k0, k1, k2, k3, k4, width, shift, edgekeys);
+    }
+
+    /**
+     * See Pointers.onTouchMove() for the represented direction.
+     */
+    public KeyValue getAtDirection(int direction)
+    {
+      Corner c = null;
+      if (edgekeys)
+      {
+        // \ 1 /
+        //  \ /
+        // 3 0 2
+        //  / \
+        // / 4 \
+        switch (direction)
+        {
+          case 2: case 3: c = key1; break;
+          case 4: case 5: c = key2; break;
+          case 6: case 7: c = key4; break;
+          case 8: case 1: c = key3; break;
+        }
+      }
+      else
+      {
+        // 1 | 2
+        //   |
+        // --0--
+        //   |
+        // 3 | 4
+        switch (direction)
+        {
+          case 1: case 2: c = key1; break;
+          case 3: case 4: c = key2; break;
+          case 5: case 6: c = key4; break;
+          case 7: case 8: c = key3; break;
+        }
+      }
+      return (c == null) ? null : c.kv;
+    }
+
+    public boolean hasValue(KeyValue kv)
+    {
+      return (hasValue(key0, kv) || hasValue(key1, kv) || hasValue(key2, kv) ||
+          hasValue(key3, kv) || hasValue(key4, kv));
+    }
+
+    private static boolean hasValue(Corner c, KeyValue kv)
+    {
+      return (c != null && c.kv.equals(kv));
     }
   }
 
-  public static class ReplaceKeysByEvent implements MapKeys
+  public static final class Corner
   {
-    private final int _eventCode;
-    private final KeyValue _replacement;
+    public final KeyValue kv;
+    /** Whether the kv is marked with the "loc " prefix. To be removed if not
+        specified in the [extra_keys]. */
+    public final boolean localized;
 
-    public ReplaceKeysByEvent(int ev, KeyValue r)
+    protected Corner(KeyValue k, boolean l)
     {
-      _eventCode = ev;
-      _replacement = r;
+      kv = k;
+      localized = l;
     }
 
-    public KeyValue map(KeyValue k)
+    public static Corner parse_of_attr(XmlResourceParser parser, String attr) throws Exception
     {
-      return (k != null && k.eventCode == _eventCode) ? _replacement : k;
-    }
-  }
+      String name = parser.getAttributeValue(null, attr);
+      boolean localized = false;
 
-  /* Replace two keys at the same time. Used for swaping keys. */
-  public static class ReplaceKeysByEvent2 implements MapKeys
-  {
-    private final int _e1;
-    private final KeyValue _r1;
-    private final int _e2;
-    private final KeyValue _r2;
-
-    public ReplaceKeysByEvent2(int e1, KeyValue r1, int e2, KeyValue r2)
-    {
-      _e1 = e1;
-      _r1 = r1;
-      _e2 = e2;
-      _r2 = r2;
-    }
-
-    public KeyValue map(KeyValue k)
-    {
-      if (k == null)
+      if (name == null)
         return null;
-      if (k.eventCode == _e1) return _r1;
-      if (k.eventCode == _e2) return _r2;
-      return k;
+      String name_loc = stripPrefix(name, "loc ");
+      if (name_loc != null)
+      {
+        localized = true;
+        name = name_loc;
+      }
+      return new Corner(KeyValue.getKeyByName(name), localized);
+    }
+
+    public static Corner of_kv(KeyValue kv)
+    {
+      return new Corner(kv, false);
+    }
+
+    private static String stripPrefix(String s, String prefix)
+    {
+      if (s.startsWith(prefix))
+        return s.substring(prefix.length());
+      else
+        return null;
+    }
+  }
+
+  // Not using Function<KeyValue, KeyValue> to keep compatibility with Android 6.
+  public static abstract interface MapKey {
+    public Key apply(Key k);
+  }
+
+  public static abstract class MapKeyValues implements MapKey {
+    abstract public KeyValue apply(KeyValue c, boolean localized);
+
+    public Key apply(Key k)
+    {
+      return new Key(apply(k.key0), apply(k.key1), apply(k.key2),
+          apply(k.key3), apply(k.key4), k.width, k.shift, k.edgekeys);
+    }
+
+    private Corner apply(Corner c)
+    {
+      if (c == null)
+        return null;
+      KeyValue kv = apply(c.kv, c.localized);
+      if (kv == null)
+        return null;
+      return Corner.of_kv(kv);
     }
   }
 

srcs/juloo.keyboard2/Pointers.java

@@ -2,6 +2,7 @@ package juloo.keyboard2;
 
 import android.os.Handler;
 import android.os.Message;
+import java.util.Arrays;
 import java.util.ArrayList;
 
 /**
@@ -22,12 +23,27 @@ public final class Pointers implements Handler.Callback
     _config = c;
   }
 
-  public int getFlags()
+  /** Return the list of modifiers currently activated. */
+  public Modifiers getModifiers()
   {
-    int flags = 0;
-    for (Pointer p : _ptrs)
-      flags |= p.flags;
-    return flags;
+    return getModifiers(false);
+  }
+
+  /** When [skip_latched] is true, don't take flags of latched keys into account. */
+  private Modifiers getModifiers(boolean skip_latched)
+  {
+    int n_ptrs = _ptrs.size();
+    KeyValue.Modifier[] mods = new KeyValue.Modifier[n_ptrs];
+    int n_mods = 0;
+    for (int i = 0; i < n_ptrs; i++)
+    {
+      Pointer p = _ptrs.get(i);
+      if (p.value != null && p.value.getKind() == KeyValue.Kind.Modifier
+          && !(skip_latched && p.pointerId == -1
+            && (p.flags & KeyValue.FLAG_LOCKED) == 0))
+        mods[n_mods++] = p.value.getModifier();
+    }
+    return Modifiers.ofArray(mods, n_mods);
   }
 
   public void clear()
@@ -53,11 +69,29 @@ public final class Pointers implements Handler.Callback
   public int getKeyFlags(KeyValue kv)
   {
     for (Pointer p : _ptrs)
-      if (p.value == kv)
+      if (p.value != null && p.value.equals(kv))
         return p.flags;
     return -1;
   }
 
+  /** Fake pointers are latched and not lockable. */
+  public void add_fake_pointer(KeyValue kv, KeyboardData.Key key)
+  {
+    // Avoid adding a fake pointer to a key that is already down.
+    if (isKeyDown(key))
+      return;
+    Pointer ptr = new Pointer(-1, key, kv, 0.f, 0.f, Modifiers.EMPTY);
+    ptr.flags = ptr.flags & ~(KeyValue.FLAG_LATCH | KeyValue.FLAG_LOCK | KeyValue.FLAG_FAKE_PTR);
+    _ptrs.add(ptr);
+  }
+
+  public void remove_fake_pointer(KeyValue kv, KeyboardData.Key key)
+  {
+    Pointer ptr = getLatched(key, kv);
+    if (ptr != null && (ptr.flags & KeyValue.FLAG_FAKE_PTR) != 0)
+      removePtr(ptr);
+  }
+
   // Receiving events
 
   public void onTouchUp(int pointerId)
@@ -66,43 +100,98 @@ public final class Pointers implements Handler.Callback
     if (ptr == null)
       return;
     stopKeyRepeat(ptr);
-    Pointer latched = getLatched(ptr.value);
+    Pointer latched = getLatched(ptr);
     if (latched != null) // Already latched
     {
       removePtr(ptr); // Remove dupplicate
-      if ((latched.flags & KeyValue.FLAG_LOCK) != 0) // Locking key, toggle lock
-      {
-        latched.flags = (latched.flags & ~KeyValue.FLAG_LOCK) | KeyValue.FLAG_LOCKED;
-        _handler.onPointerFlagsChanged();
-      }
+      if ((latched.flags & KeyValue.FLAG_LOCK) != 0) // Toggle lockable key
+        lockPointer(latched, false);
       else // Otherwise, unlatch
       {
         removePtr(latched);
-        _handler.onPointerUp(ptr.value);
+        _handler.onPointerUp(ptr.value, ptr.modifiers);
       }
     }
     else if ((ptr.flags & KeyValue.FLAG_LATCH) != 0)
     {
       ptr.flags &= ~KeyValue.FLAG_LATCH;
       ptr.pointerId = -1; // Latch
-      _handler.onPointerFlagsChanged();
+      _handler.onPointerFlagsChanged(false);
     }
     else
     {
       clearLatched();
       removePtr(ptr);
-      _handler.onPointerUp(ptr.value);
+      _handler.onPointerUp(ptr.value, ptr.modifiers);
     }
   }
 
+  public void onTouchCancel(int pointerId)
+  {
+    Pointer ptr = getPtr(pointerId);
+    if (ptr == null)
+      return;
+    stopKeyRepeat(ptr);
+    removePtr(ptr);
+    _handler.onPointerFlagsChanged(true);
+  }
+
+  /* Whether an other pointer is down on a non-special key. */
+  private boolean isOtherPointerDown()
+  {
+    for (Pointer p : _ptrs)
+      if (p.pointerId != -1 && (p.flags & KeyValue.FLAG_SPECIAL) == 0)
+        return true;
+    return false;
+  }
+
   public void onTouchDown(float x, float y, int pointerId, KeyboardData.Key key)
   {
-    KeyValue value = key.key0;
-    Pointer ptr = new Pointer(pointerId, key, value, x, y);
+    // Ignore new presses while a modulated key is active. On some devices,
+    // ghost touch events can happen while the pointer travels on top of other
+    // keys.
+    if (isModulatedKeyPressed())
+      return;
+    // Don't take latched modifiers into account if an other key is pressed.
+    // The other key already "own" the latched modifiers and will clear them.
+    Modifiers mods = getModifiers(isOtherPointerDown());
+    KeyValue value = handleKV(key.key0, mods);
+    Pointer ptr = new Pointer(pointerId, key, value, x, y, mods);
     _ptrs.add(ptr);
-    if (value != null && (value.flags & KeyValue.FLAG_NOREPEAT) == 0)
-      startKeyRepeat(ptr);
-    _handler.onPointerDown(value);
+    startKeyRepeat(ptr);
+    _handler.onPointerDown(false);
+  }
+
+  /*
+   * Get the KeyValue at the given direction. In case of swipe (!= 0), get the
+   * nearest KeyValue that is not key0.
+   * Take care of applying [_handler.onPointerSwipe] to the selected key, this
+   * must be done at the same time to be sure to treat removed keys correctly.
+   * Return [null] if no key could be found in the given direction or if the
+   * selected key didn't change.
+   */
+  private KeyValue getKeyAtDirection(Pointer ptr, int direction)
+  {
+    if (direction == 0)
+      return handleKV(ptr.key.key0, ptr.modifiers);
+    KeyValue k;
+    for (int i = 0; i > -3; i = (~i>>31) - i)
+    {
+      int d = (direction + i + 8 - 1) % 8 + 1;
+      // Don't make the difference between a key that doesn't exist and a key
+      // that is removed by [_handler]. Triggers side effects.
+      k = _handler.modifyKey(ptr.key.getAtDirection(d), ptr.modifiers);
+      if (k != null)
+        return k;
+    }
+    return null;
+  }
+
+  private KeyValue handleKV(KeyboardData.Corner c, Modifiers modifiers)
+  {
+    if (c == null)
+      return null;
+    return _handler.modifyKey(c.kv, modifiers);
   }
 
   public void onTouchMove(float x, float y, int pointerId)
@@ -110,44 +199,51 @@ public final class Pointers implements Handler.Callback
     Pointer ptr = getPtr(pointerId);
     if (ptr == null)
       return;
+
+    // The position in a IME windows is clampled to view.
+    // For a better up swipe behaviour, set the y position to a negative value when clamped.
+    if (y == 0.0) y = -400;
+
     float dx = x - ptr.downX;
     float dy = y - ptr.downY;
     float dist = Math.abs(dx) + Math.abs(dy);
     ptr.ptrDist = dist;
-    KeyValue newValue;
+
+    int direction;
     if (dist < _config.swipe_dist_px)
     {
-      newValue = ptr.key.key0;
-    }
-    else if (ptr.key.edgekeys)
-    {
-      if (Math.abs(dy) > Math.abs(dx)) // vertical swipe
-        newValue = (dy < 0) ? ptr.key.key1 : ptr.key.key4;
-      else // horizontal swipe
-        newValue = (dx < 0) ? ptr.key.key3 : ptr.key.key2;
+      direction = 0;
     }
     else
     {
-      if (dx < 0) // left side
-        newValue = (dy < 0) ? ptr.key.key1 : ptr.key.key3;
-      else // right side
-        newValue = (dy < 0) ? ptr.key.key2 : ptr.key.key4;
+      // One of the 8 directions:
+      // |\2|3/|
+      // |1\|/4|
+      // |-----|
+      // |8/|\5|
+      // |/7|6\|
+      direction = 1;
+      if (dx > 0) direction += 2;
+      if (dx > Math.abs(dy) || (dx < 0 && dx > -Math.abs(dy))) direction += 1;
+      if (dy > 0) direction = 9 - direction;
     }
-    if (newValue != null && newValue != ptr.value)
+
+    if (direction != ptr.selected_direction)
     {
-      int old_flags = (ptr.value != null) ? ptr.value.flags : 0;
-      ptr.value = newValue;
-      ptr.flags = newValue.flags;
-      if ((old_flags & newValue.flags & KeyValue.FLAG_PRECISE_REPEAT) != 0)
+      ptr.selected_direction = direction;
+      KeyValue newValue = getKeyAtDirection(ptr, direction);
+      if (newValue != null && (ptr.value == null || !newValue.equals(ptr.value)))
       {
+        int old_flags = ptr.flags;
+        ptr.value = newValue;
+        ptr.flags = newValue.getFlags();
         // Keep the keyrepeat going between modulated keys.
-      }
-      else
-      {
-        stopKeyRepeat(ptr);
-        if ((newValue.flags & KeyValue.FLAG_NOREPEAT) == 0)
+        if ((old_flags & ptr.flags & KeyValue.FLAG_PRECISE_REPEAT) == 0)
+        {
+          stopKeyRepeat(ptr);
           startKeyRepeat(ptr);
-        _handler.onPointerSwipe(newValue);
+        }
+        _handler.onPointerDown(true);
       }
     }
   }
@@ -167,10 +263,17 @@ public final class Pointers implements Handler.Callback
     _ptrs.remove(ptr);
   }
 
-  private Pointer getLatched(KeyValue kv)
+  private Pointer getLatched(Pointer target)
   {
+    return getLatched(target.key, target.value);
+  }
+
+  private Pointer getLatched(KeyboardData.Key k, KeyValue v)
+  {
+    if (v == null)
+      return null;
     for (Pointer p : _ptrs)
-      if (p.value == kv && p.pointerId == -1)
+      if (p.key == k && p.pointerId == -1 && p.value != null && p.value.equals(v))
         return p;
     return null;
   }
@@ -183,12 +286,29 @@ public final class Pointers implements Handler.Callback
       // Latched and not locked, remove
       if (ptr.pointerId == -1 && (ptr.flags & KeyValue.FLAG_LOCKED) == 0)
         _ptrs.remove(i);
-      // Not latched but pressed, don't latch once released
+      // Not latched but pressed, don't latch once released and stop long press.
       else if ((ptr.flags & KeyValue.FLAG_LATCH) != 0)
         ptr.flags &= ~KeyValue.FLAG_LATCH;
     }
   }
 
+  /** Make a pointer into the locked state. */
+  private void lockPointer(Pointer ptr, boolean shouldVibrate)
+  {
+    ptr.flags = (ptr.flags & ~KeyValue.FLAG_LOCK) | KeyValue.FLAG_LOCKED;
+    _handler.onPointerFlagsChanged(shouldVibrate);
+  }
+
+  private boolean isModulatedKeyPressed()
+  {
+    for (Pointer ptr : _ptrs)
+    {
+      if ((ptr.flags & KeyValue.FLAG_PRECISE_REPEAT) != 0)
+        return true;
+    }
+    return false;
+  }
+
   // Key repeat
 
   /** Message from [_keyrepeat_handler]. */
@@ -199,26 +319,33 @@ public final class Pointers implements Handler.Callback
     {
       if (ptr.timeoutWhat == msg.what)
       {
-        long nextInterval = _config.longPressInterval;
-        if (_config.preciseRepeat && (ptr.flags & KeyValue.FLAG_PRECISE_REPEAT) != 0)
-        {
-          // Slower repeat for modulated keys
-          nextInterval *= 2;
-          // Modulate repeat interval depending on the distance of the pointer
-          nextInterval = (long)((float)nextInterval / modulatePreciseRepeat(ptr));
-        }
-        _keyrepeat_handler.sendEmptyMessageDelayed(msg.what, nextInterval);
-        _handler.onPointerHold(ptr.value);
-        return (true);
+        if (handleKeyRepeat(ptr))
+          _keyrepeat_handler.sendEmptyMessageDelayed(msg.what, nextRepeatInterval(ptr));
+        else
+          ptr.timeoutWhat = -1;
+        return true;
       }
     }
-    return (false);
+    return false;
+  }
+
+  private long nextRepeatInterval(Pointer ptr)
+  {
+    long t = _config.longPressInterval;
+    if (_config.preciseRepeat && (ptr.flags & KeyValue.FLAG_PRECISE_REPEAT) != 0)
+    {
+      // Modulate repeat interval depending on the distance of the pointer
+      t = (long)((float)t * 2.f / modulatePreciseRepeat(ptr));
+    }
+    return t;
   }
 
   private static int uniqueTimeoutWhat = 0;
 
   private void startKeyRepeat(Pointer ptr)
   {
+    if (ptr.value == null)
+      return;
     int what = (uniqueTimeoutWhat++);
     ptr.timeoutWhat = what;
     long timeout = _config.longPressTimeout;
@@ -238,6 +365,22 @@ public final class Pointers implements Handler.Callback
     }
   }
 
+  /** A pointer is repeating. Returns [true] if repeat should continue. */
+  private boolean handleKeyRepeat(Pointer ptr)
+  {
+    // Long press toggle lock on modifiers
+    if ((ptr.flags & KeyValue.FLAG_LATCH) != 0)
+    {
+      lockPointer(ptr, true);
+      return false;
+    }
+    // Stop repeating: Latched key, special keys
+    if (ptr.pointerId == -1 || (ptr.flags & KeyValue.FLAG_SPECIAL) != 0)
+      return false;
+    _handler.onPointerHold(ptr.value, ptr.modifiers);
+    return true;
+  }
+
   private float modulatePreciseRepeat(Pointer ptr)
   {
     if (ptr.repeatingPtrDist < 0.f)
@@ -249,42 +392,110 @@ public final class Pointers implements Handler.Callback
     return Math.min(8.f, Math.max(0.1f, accel));
   }
 
-  private final class Pointer
+  private static final class Pointer
   {
     /** -1 when latched. */
     public int pointerId;
-    public KeyboardData.Key key;
+    /** The Key pressed by this Pointer */
+    public final KeyboardData.Key key;
+    /** Current direction. */
+    public int selected_direction;
+    /** Selected value with [modifiers] applied. */
     public KeyValue value;
     public float downX;
     public float downY;
     /** Distance of the pointer to the initial press. */
     public float ptrDist;
+    /** Modifier flags at the time the key was pressed. */
+    public Modifiers modifiers;
+    /** Flags of the value. Latch, lock and locked flags are updated. */
     public int flags;
     /** Identify timeout messages. */
     public int timeoutWhat;
     /** ptrDist at the first repeat, -1 otherwise. */
     public float repeatingPtrDist;
 
-    public Pointer(int p, KeyboardData.Key k, KeyValue v, float x, float y)
+    public Pointer(int p, KeyboardData.Key k, KeyValue v, float x, float y, Modifiers m)
     {
       pointerId = p;
       key = k;
+      selected_direction = 0;
       value = v;
       downX = x;
       downY = y;
       ptrDist = 0.f;
-      flags = (v == null) ? 0 : v.flags;
+      modifiers = m;
+      flags = (v == null) ? 0 : v.getFlags();
       timeoutWhat = -1;
       repeatingPtrDist = -1.f;
     }
   }
 
+  /** Represent modifiers currently activated.
+      Sorted in the order they should be evaluated. */
+  public static final class Modifiers
+  {
+    private final KeyValue.Modifier[] _mods;
+    private final int _size;
+
+    private Modifiers(KeyValue.Modifier[] m, int s)
+    {
+      _mods = m; _size = s;
+    }
+
+    public KeyValue.Modifier get(int i) { return _mods[_size - 1 - i]; }
+    public int size() { return _size; }
+
+    @Override
+    public int hashCode() { return Arrays.hashCode(_mods); }
+    @Override
+    public boolean equals(Object obj)
+    {
+      return Arrays.equals(_mods, ((Modifiers)obj)._mods);
+    }
+
+    public static final Modifiers EMPTY =
+      new Modifiers(new KeyValue.Modifier[0], 0);
+
+    protected static Modifiers ofArray(KeyValue.Modifier[] mods, int size)
+    {
+      // Sort and remove duplicates and nulls.
+      if (size > 1)
+      {
+        Arrays.sort(mods, 0, size);
+        int j = 0;
+        for (int i = 0; i < size; i++)
+        {
+          KeyValue.Modifier m = mods[i];
+          if (m != null && (i + 1 >= size || m != mods[i + 1]))
+          {
+            mods[j] = m;
+            j++;
+          }
+        }
+        size = j;
+      }
+      return new Modifiers(mods, size);
+    }
+  }
+
   public interface IPointerEventHandler
   {
-    public void onPointerDown(KeyValue k);
-    public void onPointerSwipe(KeyValue k);
-    public void onPointerUp(KeyValue k);
-    public void onPointerFlagsChanged();
-    public void onPointerHold(KeyValue k);
+    /** Key can be modified or removed by returning [null]. */
+    public KeyValue modifyKey(KeyValue k, Modifiers flags);
+
+    /** A key is pressed. [getModifiers()] is uptodate. Might be called after a
+        press or a swipe to a different value. */
+    public void onPointerDown(boolean isSwipe);
+
+    /** Key is released. [k] is the key that was returned by
+        [modifySelectedKey] or [modifySelectedKey]. */
+    public void onPointerUp(KeyValue k, Modifiers flags);
+
+    /** Flags changed because latched or locked keys or cancelled pointers. */
+    public void onPointerFlagsChanged(boolean shouldVibrate);
+
+    /** Key is repeating. */
+    public void onPointerHold(KeyValue k, Modifiers flags);
   }
 }

srcs/juloo.keyboard2/Theme.java

@@ -18,6 +18,9 @@ public class Theme
 
   public final float keyBorderRadius;
 
+  public final int colorNavBar;
+  public final boolean isLightNavBar;
+
   private final Paint _keyLabelPaint;
   private final Paint _specialKeyLabelPaint;
   private final Paint _keySubLabelPaint;
@@ -29,6 +32,8 @@ public class Theme
     keyBgPaint.setColor(s.getColor(R.styleable.keyboard_colorKey, 0));
     keyDownBgPaint.setColor(s.getColor(R.styleable.keyboard_colorKeyActivated, 0));
     // colorKeyboard = s.getColor(R.styleable.keyboard_colorKeyboard, 0);
+    colorNavBar = s.getColor(R.styleable.keyboard_navigationBarColor, 0);
+    isLightNavBar = s.getBoolean(R.styleable.keyboard_windowLightNavigationBar, false);
     labelColor = s.getColor(R.styleable.keyboard_colorLabel, 0);
     activatedColor = s.getColor(R.styleable.keyboard_colorLabelActivated, 0);
     lockedColor = s.getColor(R.styleable.keyboard_colorLabelLocked, 0);
@@ -37,7 +42,7 @@ public class Theme
     s.recycle();
     _keyLabelPaint = initLabelPaint(Paint.Align.CENTER, null);
     _keySubLabelPaint = initLabelPaint(Paint.Align.LEFT, null);
-    Typeface specialKeyFont = getSpecialKeyFont(context);
+    Typeface specialKeyFont = getKeyFont(context);
     _specialKeyLabelPaint = initLabelPaint(Paint.Align.CENTER, specialKeyFont);
     _specialKeySubLabelPaint = initLabelPaint(Paint.Align.LEFT, specialKeyFont);
   }
@@ -64,14 +69,12 @@ public class Theme
     return (paint);
   }
 
-  private static Typeface _specialKeyFont = null;
+  private static Typeface _key_font = null;
 
-  static public Typeface getSpecialKeyFont(Context context)
+  static public Typeface getKeyFont(Context context)
   {
-    if (_specialKeyFont == null)
-    {
-      _specialKeyFont = Typeface.createFromAsset(context.getAssets(), "fonts/keys.ttf");
-    }
-    return _specialKeyFont;
+    if (_key_font == null)
+      _key_font = Typeface.createFromAsset(context.getAssets(), "special_font.ttf");
+    return _key_font;
   }
 }

srcs/special_font/01.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- IcoMoon-Free 227-smile2 CC BY 4.0 -->
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#000000" d="M8 0c-4.418 0-8 3.582-8 8s3.582 8 8 8 8-3.582 8-8-3.582-8-8-8zM11 4c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM5 4c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM8 13c-1.82 0-3.413-0.973-4.288-2.427l1.286-0.772c0.612 1.018 1.727 1.699 3.002 1.699s2.389-0.681 3.002-1.699l1.286 0.772c-0.874 1.454-2.467 2.427-4.288 2.427z"></path>
+</svg>

srcs/special_font/02.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- IcoMoon-Free 327-move-up CC BY 4.0 -->
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#000000" d="M11 8v6h1v-6h2.5l-3-3-3 3z"></path>
+<path fill="#000000" d="M1 3h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M3 3h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M5 3h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M1 6.5h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M2.5 7h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M4.5 7h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M1 4.5h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M5 5h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M5 11v3h-3v-3h3zM6 10h-5v5h5v-5z"></path>
+</svg>

srcs/special_font/03.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- IcoMoon-Free 328-move-down CC BY 4.0 -->
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<path fill="#000000" d="M12 11v-6h-1v6h-2.5l3 3 3-3z"></path>
+<path fill="#000000" d="M5 4v3h-3v-3h3zM6 3h-5v5h5v-5z"></path>
+<path fill="#000000" d="M1 10h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M3 10h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M5 10h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M1 13.5h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M2.5 14h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M4.5 14h1.5v1h-1.5v-1z"></path>
+<path fill="#000000" d="M1 11.5h1v1.5h-1v-1.5z"></path>
+<path fill="#000000" d="M5 12h1v1.5h-1v-1.5z"></path>
+</svg>

srcs/special_font/04.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2022 Fonticons, Inc. --><path d="M495.9 166.6C499.2 175.2 496.4 184.9 489.6 191.2L446.3 230.6C447.4 238.9 448 247.4 448 256C448 264.6 447.4 273.1 446.3 281.4L489.6 320.8C496.4 327.1 499.2 336.8 495.9 345.4C491.5 357.3 486.2 368.8 480.2 379.7L475.5 387.8C468.9 398.8 461.5 409.2 453.4 419.1C447.4 426.2 437.7 428.7 428.9 425.9L373.2 408.1C359.8 418.4 344.1 427 329.2 433.6L316.7 490.7C314.7 499.7 307.7 506.1 298.5 508.5C284.7 510.8 270.5 512 255.1 512C241.5 512 227.3 510.8 213.5 508.5C204.3 506.1 197.3 499.7 195.3 490.7L182.8 433.6C167 427 152.2 418.4 138.8 408.1L83.14 425.9C74.3 428.7 64.55 426.2 58.63 419.1C50.52 409.2 43.12 398.8 36.52 387.8L31.84 379.7C25.77 368.8 20.49 357.3 16.06 345.4C12.82 336.8 15.55 327.1 22.41 320.8L65.67 281.4C64.57 273.1 64 264.6 64 256C64 247.4 64.57 238.9 65.67 230.6L22.41 191.2C15.55 184.9 12.82 175.3 16.06 166.6C20.49 154.7 25.78 143.2 31.84 132.3L36.51 124.2C43.12 113.2 50.52 102.8 58.63 92.95C64.55 85.8 74.3 83.32 83.14 86.14L138.8 103.9C152.2 93.56 167 84.96 182.8 78.43L195.3 21.33C197.3 12.25 204.3 5.04 213.5 3.51C227.3 1.201 241.5 0 256 0C270.5 0 284.7 1.201 298.5 3.51C307.7 5.04 314.7 12.25 316.7 21.33L329.2 78.43C344.1 84.96 359.8 93.56 373.2 103.9L428.9 86.14C437.7 83.32 447.4 85.8 453.4 92.95C461.5 102.8 468.9 113.2 475.5 124.2L480.2 132.3C486.2 143.2 491.5 154.7 495.9 166.6V166.6zM256 336C300.2 336 336 300.2 336 255.1C336 211.8 300.2 175.1 256 175.1C211.8 175.1 176 211.8 176 255.1C176 300.2 211.8 336 256 336z"/></svg>

srcs/special_font/05.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- materialdesignicons.com arrow-up-bold -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15,20H9V12H4.16L12,4.16L19.84,12H15V20Z" /></svg>

srcs/special_font/06.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- materialdesignicons.com arrow-right-bold -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M4,15V9H12V4.16L19.84,12L12,19.84V15H4Z" /></svg>