Release 1.16.1

Bring back the "Vibration" option.

The duration option isn't added back because the vibration settings are
still handled by Android. In fact, the option has no effect if the
vibration are disabled in the system settings.

This partially reverts commit ef03dfed5c.

.github/workflows/make-apk.yml

@@ -0,0 +1,42 @@
+name: Make Apk CI
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+jobs:
+  Build-Apk:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/setup-java@v2
+      with:
+        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: 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:
+        name: debug apk
+        path: _build/*.apk

.gitignore

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

AndroidManifest.xml

@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="juloo.keyboard2"
-		android:versionCode="12"
-		android:versionName="1.9.2"
-		android:hardwareAccelerated="false">
-
-	<uses-sdk android:minSdkVersion="4"
-			android:targetSdkVersion="29" />
-
-	<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">
-			<intent-filter>
-				<action android:name="android.view.InputMethod" />
-			</intent-filter>
-			<meta-data android:name="android.view.im"
-					android:resource="@xml/method" />
-		</service>
-
-		<activity android:name="juloo.keyboard2.SettingsActivity"
-				android:icon="@drawable/ic_launcher"
-				android:label="@string/settings_activity_label">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN"/>
-			</intent-filter>
-		</activity>
-
-	</application>
-
-	<uses-permission android:name="android.permission.VIBRATE" />
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="24" android:versionName="1.16.1" 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">
+      <intent-filter>
+        <action android:name="android.view.InputMethod"/>
+      </intent-filter>
+      <meta-data android:name="android.view.im" android:resource="@xml/method"/>
+    </service>
+    <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@drawable/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/android:Theme.Material">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+      </intent-filter>
+    </activity>
+  </application>
+  <uses-permission android:name="android.permission.VIBRATE"/>
 </manifest>

CONTRIBUTING.md

@@ -0,0 +1,131 @@
+# Contributing
+
+Thanks for contributing :)
+
+## Building the app
+
+The application doesn't use Gradle and it might be hard to use some features of
+Android Studio.
+
+Fortunately, there's not many dependencies:
+- OpenJDK 8
+- Android SDK: build tools (minimum `28.0.1`), platform `30`
+- Make sure to have the `$ANDROID_HOME` environment variable set.
+
+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:
+
+```sh
+make
+```
+
+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
+
+First [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb#Enabling).
+Then connect your phone to your computer using an USB cable or wireless
+debugging.
+
+And finally, install the application with:
+```sh
+make installd
+```
+
+The debug version of the application won't be removed, both versions will stay
+installed at the same time.
+
+The application must be enabled in the settings:
+System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
+
+## Debugging the application: INSTALL_FAILED_UPDATE_INCOMPATIBLE
+
+`make installd` can fail with the following error message:
+
+```
+adb: failed to install _build/juloo.keyboard2.debug.apk: Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Package juloo.keyboard2.debug signatures do not match previously installed version; ignoring!]
+make: *** [Makefile:20: installd] Error 1
+```
+
+The application can't be "updated" because the temporary certificate has been
+lost. The solution is to uninstall and install again.
+The application must be enabled again in the settings.
+
+```sh
+adb uninstall juloo.keyboard2.debug
+make installd
+```
+
+## Guidelines
+
+### Adding a programming layout
+
+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).
+
+They don't need to contain every ASCII characters (although it's useful in
+passwords) and dead-keys.
+
+### Adding support for a language
+
+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).
+
+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

@@ -2,11 +2,10 @@
 
 PACKAGE_NAME = juloo.keyboard2
 
-ANDROID_PLATFORM_VERSION = android-29
+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,12 +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)
-
-# Align
-
-_build/%.apk: _build/%.signed-apk
-	$(ANDROID_BUILD_TOOLS)/zipalign -fp 4 "$<" "$@"
 
 # Debug signing
 
@@ -59,31 +59,39 @@ $(DEBUG_KEYSTORE):
 		-alias debug -keypass $(DEBUG_PASSWD) -keystore "$@" \
 		-keyalg rsa -storepass $(DEBUG_PASSWD) -validity 10000
 
-_build/%.debug.signed-apk: _build/%.debug.unsigned-apk $(DEBUG_KEYSTORE)
-	jarsigner -keystore $(DEBUG_KEYSTORE) \
-		-storepass $(DEBUG_PASSWD) -keypass $(DEBUG_PASSWD) \
-		-signedjar "$@" "$<" debug
+_build/%.debug.apk: _build/%.debug.unsigned-apk $(DEBUG_KEYSTORE)
+	$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
+		--ks $(DEBUG_KEYSTORE) --ks-key-alias debug --ks-pass "pass:$(DEBUG_PASSWD)"
 
 # 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
 
-# %-keystore.conf should declare KEYSTORE, KEYNAME and OPTS
+# %-keystore.conf should declare KEYSTORE, KEYNAME and KEYSTOREPASS
 #  it is interpreted as a shell script
-# OPTS can be used to pass -storepass or -keypass options to jarsigner
-_build/%.signed-apk: _build/%.unsigned-apk %-keystore.conf
+_build/%.apk: _build/%.unsigned-apk %-keystore.conf
 	eval `cat $(word 2,$^)` && \
-	jarsigner -sigalg SHA1withRSA -digestalg SHA1 -keystore "$$KEYSTORE" $$OPTS -signedjar "$@" "$<" "$$KEYNAME"
+	$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
+		--ks "$$KEYSTORE" --ks-key-alias "$$KEYNAME" --ks-pass "pass:$$KEYSTOREPASS"
 
 # Package
 
-_build/%.unsigned-apk: _build/classes.dex $(MANIFEST_FILE) $(ASSETS_FILES)
+_build/%.unsigned-apk: _build/%.unaligned-apk
+	$(ANDROID_BUILD_TOOLS)/zipalign -fp 4 "$<" "$@"
+
+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
 
@@ -108,4 +116,4 @@ _build/classes.dex: $(JAVA_FILES) $(R_FILE)
 		-classpath $(ANDROID_PLATFORM)/android.jar:$(EXTRA_JARS) \
 		-sourcepath $(SRC_DIR):$(GEN_DIR) \
 		$^
-	$(ANDROID_BUILD_TOOLS)/dx --dex --output="$@" $(OBJ_DIR) $(subst :, ,$(EXTRA_JARS))
+	$(ANDROID_BUILD_TOOLS)/d8 --output $(@D) $(OBJ_DIR)/*/*/* $(subst :, ,$(EXTRA_JARS))

README.md

@@ -1,12 +1,37 @@
 # Unexpected Keyboard
 
 A lightweight virtual keyboard for developers.
+| <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" /> |
 
-![Unexpected Keyboard](play_store/capture1.png)
+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..).
 
-All the characters you might need are available on a single screen, as well as control, alt, escape and many others.
+The keyboard shows up to 4 extra characters in the corners of each key. These extra characters are hit by swiping the finger on the key.
 
-Several characters are displayed on each key. Get the one in the middle with a press and the ones in the corners by sliding your finger.
+Highlight of some of the features:
 
-Like any other keyboard app, you will need to activate it in the system settings to be able to use it.
-This can be found in the System Settings > System > Languages & Input > Virtual keyboard > Manage keyboards.
+- Every character and special keys that are also available on a PC keyboard. This is perfect for using applications like Termux.
+
+- This includes Tab, Esc, the arrows and function keys, but also Ctrl and Alt !
+
+- Accented keys are accessible using dead keys. First activate the accent, then type the accented letter.
+
+- Very light and fast. Use 500x times less space than Google's keyboard and 15x times less than the default keyboard. No ad, no tracking.
+
+- Multiple layouts: QWERTY, QWERTZ, AZERTY. Themes: White, Dark, OLED Black. And many other options.
+
+Like any other virtual keyboards, it must be enabled in the system settings. Open the System Settings and go to:
+System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
+
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/juloo.keyboard2/)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="80">](https://play.google.com/store/apps/details?id=juloo.keyboard2)
+
+## Contributing
+
+For instructions on building the application, see
+[Contributing](CONTRIBUTING.md).

metadata/android/de-DE/full_description.txt

@@ -0,0 +1,18 @@
+Diese App ist eine virtuelle Tastatur für Android. Hauptfunktionen sind das einfache Tippen eines jeden ASCII-Zeichens durch Wischgesten, Hilfstasten, Tottasten für Akzente, sowie das Vorhandensein spezieller Tasten (Tabulator, Esc, Pfeiltasten etc.). 
+
+Die Tastatur hat bis zu vier Extrazeichen in den Ecken jeder Taste. Diese Extrazeichen werden durch das Wischen mit dem Finger auf der Taste ausgewählt.
+
+Highlights mancher Funktionen:
+
+- Jedes Zeichen und jede spezielle Taste gibt es auch auf einer PC-Tastatur. Das ist perfekt für die Nutzung von Anwendungen wie Termux.
+
+- Dies schließt auch Tab, Esc und die Pfeil- und Funktionstasten sowie Strg und Alt mit ein!
+
+- Akzenttasten sind über Tottasten verfügbar. Nach Aktivieren des Akzents kan der akzentuierte Buchstabe getippt werden. 
+
+- Sehr schlank und schnell. Braucht 500x weniger Speicherplatz als Googles Tastatur und 15x weniger als die Standardtastatur. Keine Werbung, kein Tracking.
+
+- Verschiedene Layouts: QWERTY, QWERTZ, AZERTY. Themes: Weiß, Dunkel, OLED Schwarz. Und viele weitere Optionen.
+
+Wie jede andere virtuelle Tastatur muss diese Tastatur in den Systemeinstellungen aktiviert werden. Dazu Systemeinstellungen öffnen und wie folgt vorgehen: 
+System > Sprachen und Eingabe > Bildschirmtastatur > Bildschirmtastaturen verwalten. 

metadata/android/de-DE/short_description.txt

@@ -0,0 +1 @@
+Eine schlanke Bildschirmtastatur für Entwickler

metadata/android/de-DE/title.txt

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

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

@@ -1 +1 @@
-First open-source release !
+First open-source release!

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

@@ -0,0 +1,3 @@
+- Add support for Swedish
+- Fix keyboard shortcuts not working in some applications
+- Fix a graphical bug and add some tweaks

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

@@ -0,0 +1,8 @@
+New languages: German
+
+New keyboard layouts: QWERTZ
+
+Added themes: White, Dark and OLED Black
+
+Added the Action key near the Enter key, required for some app.
+Improved some options and fixed a few bugs.

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

@@ -0,0 +1,8 @@
+New languages: German
+
+New keyboard layouts: QWERTZ
+
+Added themes: White, Dark and OLED Black
+
+Added the Action key near the Enter key, required for some app.
+Improved some options and fixed a few bugs.

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

@@ -0,0 +1,13 @@
+New languages: Latvian (thanks @eandersons), Bulgarian (thanks Zdravko Iskrenov)
+New layouts: Bulgarian traditional, Latvian
+
+The application can now be translated.
+Translations: French, Latvian (thanks @eandersons)
+
+Improve the behavior of the Action key.
+The globe key now opens the keyboard switching dialog.
+The literal tab character can be typed with Fn+Tab.
+Add options to control the spacing between the keys.
+Better integration with the system theme.
+
+Thanks to all the contributors: @Moini, @sdrapha, @eandersons, @Poussinou, Zdravko Iskrenov

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

@@ -0,0 +1,13 @@
+New languages: Portuguese (thanks @sdrapha), Russian (thanks @carrot-cookie), Spanish (thanks @gh0ste)
+New layouts: Dvorak (thanks @AlexandraAlter), Russian Jcuken, Spanish Qwerty
+
+Added the Meta key (the equivalent of the Win on Windows)
+Added ordinal symbols on the number pane (thanks @sdrapha)
+Better position for the arrow keys (thanks @MaxGyver83)
+Improvements to some of the symbols (thanks @MaxGyver83, @Roy-Orbison)
+Improvements to the layouts
+Improvements to the key-repeat for arrows
+Fixed Shift+Arrows for selecting text
+Fixed dark theme bugs on Xiaomi phones
+
+Thanks to all the contributors: @sdrapha, @MaxGyver83, @AlexandraAlter, @Roy-Orbison, @carrot-cookie, @gh0ste

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

@@ -0,0 +1,5 @@
+Improved text size, especially on large screens
+Increased contrasts
+Improved symbols (thanks @sdrapha)
+German translation (thanks @polyctena)
+Fix to some layouts.

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/full_description.txt

@@ -1,6 +1,18 @@
-All the characters you might need are available on a single screen, as well as control, alt, escape and many others.
+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..).
 
-Several characters are displayed on each key. Get the one in the middle with a press and the ones in the corners by sliding your finger.
+The keyboard shows up to 4 extra characters in the corners of each key. These extra characters are hit by swiping the finger on the key.
 
-Like any other keyboard app, you will need to activate it in the system settings to be able to use it.
-This can be found in the System Settings > System > Languages & Input > Virtual keyboard > Manage keyboards.
+Highlight of some of the features:
+
+- Every character and special keys that are also available on a PC keyboard. This is perfect for using applications like Termux.
+
+- This includes Tab, Esc, the arrows and function keys, but also Ctrl and Alt !
+
+- Accented keys are accessible using dead keys. First activate the accent, then type the accented letter.
+
+- Very light and fast. Use 500x times less space than Google's keyboard and 15x times less than the default keyboard. No ad, no tracking.
+
+- Multiple layouts: QWERTY, QWERTZ, AZERTY. Themes: White, Dark, OLED Black. And many other options.
+
+Like any other virtual keyboards, it must be enabled in the system settings. Open the System Settings and go to:
+System > Languages & input > On-screen keyboard > Manage on-screen keyboards.

metadata/android/es-ES/short_description.txt

@@ -0,0 +1 @@
+Un teclado virtual ligero para desarrolladores.

metadata/android/es-ES/title.txt

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

metadata/android/fr-FR/changelogs/11.txt

@@ -1,3 +0,0 @@
-- Ajout de l'Espagnol et l'Italien
-- Nouvel emplacement pour les accents (encore) et ajout de nouveaux caratères
-- Correction de bugs (un crash sur d'anciennes versions d'Android et un rare glitch graphique après une rotation)

metadata/android/fr-FR/changelogs/12.txt

@@ -1 +0,0 @@
-Première version open-source !

metadata/android/fr-FR/full_description.txt

@@ -1,3 +1,18 @@
-Tous les caractères dont vous pourriez avoir besoin sont disponibles sur un seul écran, ainsi que les touches control, alt, escape et bien d'autres.
+Cette application est un clavier virtuel pour Android. Les fonctionnalités principales sont l'accès rapide à tous les caractères ASCII en glissant le doigt, les touches mortes pour les accents et la présence des touches spéciales (Tab, Esc, les flèches, etc..).
 
-Plusieurs caractères sont affichés sur chaque touche. Tapez celui du milieu par une simple pression et ceux des coins en faisant glisser votre doigt.
+Il peut y avoir un caractère supplémentaire dans chaque coin de chaque touche. Ces caractères sont tapés en glissant le doigt sur la touche.
+
+Quelques fonctionnalités:
+
+- Tous les caractères et toutes les touches spéciales d'un clavier PC. Idéal pour utiliser une application comme Termux.
+
+- Cela comprend les touches Tab, Esc, les flèches et les touches fonctions mais aussi Ctrl et Alt !
+
+- Les accents sont des touches mortes. Activez d'abord l'accent et tapez ensuite la lettre accentuée.
+
+- Léger et rapide. Utilise 500x fois moins d'espace que le clavier de Google et 15x fois moins que le clavier de base. Pas de pub, pas de traqueur.
+
+- Plusieurs configurations: QWERTY, QWERTZ, AZERTY. Thèmes: Clair, Sombre, Noir OLED. Et beaucoup d'autres options.
+
+Comme tous les claviers virtuels, il doit être activé dans les paramètres systèmes. Ouvrez les paramètres et allez dans:
+Système > Langue & saisie > Clavier à l'écran > Gérer les claviers à l'écran.

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/lv-LV/full_description.txt

@@ -0,0 +1,18 @@
+Šī lietotne ir tastatūra Android tālruņiem. Galvenās iespējas ir ērta ASCII rakstzīmju ievadīšana ar pavilkšanas kustību, taustiņi piekļūšanai uzsvara zīmēm un pārveidošanas taustiņiem un īpašo taustiņu esamība (Tab, Esc, bultas utt.).
+
+Tastatūrā ir redzamas līdz 4 papildus rakstzīmēm katra taustiņa stūros. Tām var piekļūt ar pirksta pavilkšanu uz taustiņa attiecīgajā virzienā.
+
+Izceltās iespējas:
+
+- Visas rakstzīmes un īpašie taustiņi, kas ir atrodami arī datora tastatūrā. Tas lieliski noder tādās lietotnēs kā, piemēram, Termux.
+
+- Ir iekļauti Tab, Esc, bultas un darbību taustiņi, kā arī Ctrl un Alt.
+
+- Uzsvara zīmju taustiņi ir pieejami ar īpašām pogām. Vispirms jāizvēlas uzsvara zīmes veids, tad jāievada vēlamais burts.
+
+- Ļoti viegla un ātra. Izmanto 500 reižu mazāk vietas kā Google tastatūra un 15 reižu mazāk kā noklusējuma tastatūra. Bez reklāmām un izsekošanas.
+
+- Dažādi izkārtojumi: QWERTY, QWERTZ, AZERTY. Izskats: Gaišs, Tumšs, OLED melns. Kā arī daudzas citas papildiespējas.
+
+Kā jebkura cita tālruņa tastatūra, tā ir jāiespējo ierīces iestatījumos. Jāatver Iestatījumi un tad:
+Sistēma > Valodas un ievade > Virtuālā tastatūra > Pārvaldīt tastatūras.

metadata/android/lv-LV/short_description.txt

@@ -0,0 +1 @@
+Viegla un ātra tālruņa tastatūra izstrādātājiem.

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/layout/emoji_pane.xml

@@ -1,38 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:hardwareAccelerated="false">
-	<juloo.keyboard2.EmojiGroupButtonsBar
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content" />
-	<juloo.keyboard2.EmojiGridView
-		android:id="@+id/emoji_grid"
-		android:background="@color/bg"
-		android:layout_width="fill_parent"
-		android:layout_height="@dimen/emoji_grid_height"
-	/>
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-	>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			key="switch_back_emoji"
-		/>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			android:layout_weight="4"
-			key="space"
-		/>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			key="backspace"
-		/>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			key="enter"
-		/>
-	</LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:hardwareAccelerated="false">
+  <juloo.keyboard2.EmojiGroupButtonsBar android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+  <juloo.keyboard2.EmojiGridView android:id="@+id/emoji_grid" android:background="?attr/colorKeyboard" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_grid_height"/>
+  <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="switch_back_emoji"/>
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" android:layout_weight="4" key="space"/>
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="backspace"/>
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="enter"/>
+  </LinearLayout>
 </LinearLayout>

res/layout/keyboard.xml

@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<juloo.keyboard2.Keyboard2View xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/bg"
-	android:hardwareAccelerated="false"
-/>
+<juloo.keyboard2.Keyboard2View xmlns:android="http://schemas.android.com/apk/res/android" android:hardwareAccelerated="false" android:background="?attr/colorKeyboard"/>

res/values-de/strings.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</string>
+  <string name="pref_category_layout">Layout</string>
+  <string name="pref_layout_title">Tastaturlayout ändern</string>
+  <string name="pref_layout_e_system">Systemeinstellung</string>
+  <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_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_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</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_lockable_keys_title">Sperrbare Hilfstasten</string>
+  <string name="pref_lockable_keys_summary">Hilfstasten, die durch zweimaliges Tippen gesperrt (eingerastet) werden können</string>
+  <string name="pref_category_style">Design</string>
+  <string name="pref_margin_bottom_title">Unterer Abstand</string>
+  <string name="pref_keyboard_height_title">Höhe der Tastatur</string>
+  <string name="pref_horizontal_margin_title">Horizontaler Abstand</string>
+  <string name="pref_character_size_title">Größe der Beschriftung</string> 
+  <string name="pref_character_size_summary">Größe der Buchstaben auf den Tasten (%.2fx)</string>
+  <string name="pref_theme">Theme</string>
+  <string name="pref_theme_e_system">Systemeinstellung</string>
+  <string name="pref_theme_e_dark">Dunkel</string>
+  <string name="pref_theme_e_light">Hell</string>
+  <string name="pref_theme_e_black">Schwarz</string>
+  <string name="pref_swipe_dist_e_very_short">Sehr kurz</string>
+  <string name="pref_swipe_dist_e_short">Kurz</string>
+  <string name="pref_swipe_dist_e_default">Normal</string>
+  <string name="pref_swipe_dist_e_far">Weit</string>
+  <string name="pref_swipe_dist_e_very_far">Sehr weit</string>
+  <string name="pref_key_horizontal_space">Horizontaler Abstand zwischen den Tasten</string>
+  <string name="pref_key_vertical_space">Vertikaler Abstand zwischen den Tasten</string>
+  <string name="key_action_next">Nächstes</string>
+  <string name="key_action_done">Fertig</string>
+  <string name="key_action_go">Los</string>
+  <string name="key_action_prev">Vorheriges</string>
+  <string name="key_action_search">Suchen</string>
+  <string name="key_action_send">Senden</string>
+</resources>

res/values-es/strings.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <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>
+  <string name="pref_layout_e_system">Ajustes del sistema</string>
+  <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_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 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_vibrate_title">Vibración</string>
+  <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</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_lockable_keys_title">Bloqueo de teclas modificadoras</string>
+  <string name="pref_lockable_keys_summary">Teclas modificadoras que se pueden bloquear pulsándolas dos veces</string>
+  <string name="pref_category_style">Estilo</string>
+  <string name="pref_margin_bottom_title">Margen del pie</string>
+  <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 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>
+  <string name="pref_theme_e_light">Claro</string>
+  <string name="pref_theme_e_black">Negro</string>
+  <string name="pref_swipe_dist_e_very_short">Muy corto</string>
+  <string name="pref_swipe_dist_e_short">Corto</string>
+  <string name="pref_swipe_dist_e_default">Normal</string>
+  <string name="pref_swipe_dist_e_far">Lejano</string>
+  <string name="pref_swipe_dist_e_very_far">Muy lejano</string>
+  <string name="pref_key_horizontal_space">Espaciado horizontal entre las teclas</string>
+  <string name="pref_key_vertical_space">Espaciado vertical entre las teclas</string>
+  <string name="key_action_next">Siguiente</string>
+  <string name="key_action_done">Hecho</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-fr/strings.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <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>
+  <string name="pref_layout_e_system">Paramètre système</string>
+  <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_none">Cacher les accents</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_vibrate_title">Vibreur</string>
+  <string name="pref_vibrate_summary">Vibration a chaque touche</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>
+  <string name="pref_theme">Thème</string>
+  <string name="pref_theme_e_system">Paramètre système</string>
+  <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_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>
+  <string name="pref_swipe_dist_e_far">Longue</string>
+  <string name="pref_swipe_dist_e_very_far">Très longue</string>
+  <string name="pref_key_horizontal_space">Espacement horizontal entre les touches</string>
+  <string name="pref_key_vertical_space">Espacement vertical entre les touches</string>
+  <string name="key_action_next">Suiv.</string>
+  <string name="key_action_done">Fin</string>
+  <string name="key_action_go">Aller</string>
+  <string name="key_action_prev">Prec.</string>
+  <string name="key_action_search">Chercher</string>
+  <string name="key_action_send">Envoyer</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,10 +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>
-	<dimen name="label_text_size">18dp</dimen>
-	<dimen name="sublabel_text_size">11dp</dimen>
-	<dimen name="emoji_type_button_height">48dp</dimen>
+  <dimen name="emoji_type_button_height">48dp</dimen>
+  <dimen name="extra_horizontal_margin">25dp</dimen>
 </resources>

res/values-lv/strings.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <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>
+  <string name="pref_layout_e_system">Ierīces iestatījumi</string>
+  <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_none">Paslēpt uzsvara zīmes</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_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_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">Slēdzami pārveidotājtaustiņi</string>
+  <string name="pref_lockable_keys_summary">Pārveidotātjtaustiņi, kas var tikt slēgti ar divkāršu piesitienu</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_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>
+  <string name="pref_theme">Izskats</string>
+  <string name="pref_theme_e_system">Ierīces iestatījumi</string>
+  <string name="pref_theme_e_dark">Tumšs</string>
+  <string name="pref_theme_e_light">Gaišs</string>
+  <string name="pref_theme_e_black">Melns</string>
+  <string name="pref_swipe_dist_e_very_short">Ļoti tuvs</string>
+  <string name="pref_swipe_dist_e_short">Tuvs</string>
+  <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>
+  <string name="key_action_prev">Iepriekšējais</string>
+  <string name="key_action_search">Meklēt</string>
+  <string name="key_action_send">Sūtīt</string>
+</resources>

res/values-pt/strings.xml

@@ -0,0 +1,50 @@
+<?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_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">Teclas traváveis</string>
+  <string name="pref_lockable_keys_summary">Teclas que podem ficar seguradas ao teclar duas vezes</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_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-tr/strings.xml

@@ -0,0 +1,50 @@
+<?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_lockable_keys_title">Sabitlenebilir değiştiriciler</string>
+  <string name="pref_lockable_keys_summary">Çift vuruşla sabitlenebilecek değiştirici tuşlar</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,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 设置</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_lockable_keys_title">组合键锁定</string>
+  <string name="pref_lockable_keys_summary">可以通过输入两次锁定任何组合键(Ctrl, Alt, Fn, 声调符号等)</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,20 +4,86 @@
     <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_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>
+  </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 (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>
+  </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 name="pref_accents_default">1</string>
-
   <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">
+    <item>@string/pref_theme_e_system</item>
+    <item>@string/pref_theme_e_dark</item>
+    <item>@string/pref_theme_e_light</item>
+    <item>@string/pref_theme_e_black</item>
+  </string-array>
+  <string-array name="pref_theme_values">
+    <item>system</item>
+    <item>dark</item>
+    <item>light</item>
+    <item>black</item>
+  </string-array>
+  <string-array name="pref_swipe_dist_entries">
+    <item>@string/pref_swipe_dist_e_very_short</item>
+    <item>@string/pref_swipe_dist_e_short</item>
+    <item>@string/pref_swipe_dist_e_default</item>
+    <item>@string/pref_swipe_dist_e_far</item>
+    <item>@string/pref_swipe_dist_e_very_far</item>
+  </string-array>
+  <string-array name="pref_swipe_dist_values">
+    <item>5</item>
+    <item>7.5</item>
+    <item>15</item>
+    <item>25</item>
+    <item>35</item>
+  </string-array>
 </resources>

res/values/colors.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<item name="bg" type="color">#1B1B1B</item>
-	<item name="key_bg" type="color">#303030</item>
-	<item name="key_down_bg" type="color">#1B1B1B</item>
-	<item name="key_label" type="color">#FFFFFF</item>
-	<item name="key_label_locked" type="color">#229933</item>
-	<item name="key_label_activated" type="color">#226b99</item>
-	<item name="key_sub_label" type="color">#A0A0A0</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">@color/emoji_button_bg</item>
-	<item name="emoji_key_text" type="color">@color/key_label</item>
-</resources>

res/values/dimens.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<dimen name="horizontal_margin">3dp</dimen>
-	<dimen name="margin_top">3dp</dimen>
-	<dimen name="margin_bottom">7dp</dimen>
-	<dimen name="key_padding">2dp</dimen>
-	<dimen name="key_vertical_interval">2dp</dimen>
-	<dimen name="key_horizontal_interval">2dp</dimen>
-	<dimen name="key_height">51dp</dimen>
-	<dimen name="key_round">5dp</dimen>
-	<dimen name="label_text_size">18dp</dimen>
-	<dimen name="sublabel_text_size">12dp</dimen>
-	<dimen name="emoji_type_button_height">56dp</dimen>
-	<dimen name="emoji_grid_height">250dp</dimen>
-</resources>

res/values/strings.xml

@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-	<string name="app_name">Unexpected Keyboard</string>
-
-	<string name="settings_activity_label">Unexpected Keyboard Settings</string>
-
-  <string name="subtype_label">%s</string>
-
-	<string name="pref_category_layout">Layout</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>
-  <string name="pref_layout_summary">%s</string>
-  <string-array name="pref_layout_entries">
-    <item>System settings</item>
-    <item>Azerty</item>
-    <item>Qwerty</item>
-  </string-array>
-
+  <string name="pref_layout_e_system">System settings</string>
   <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_summary">%s</string>
-  <string name="pref_accents_e_all_installed">Show accents for all the installed languages</string>
-  <string name="pref_accents_e_selected">Show accents for the selected language</string>
-  <string name="pref_accents_e_all">Show every 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_none">Hide accents</string>
-
-	<string name="pref_category_typing">Typing</string>
-	<string name="pref_preci_title">Precision</string>
-	<string name="pref_preci_summary">Distance of corner values (%spx)</string>
-	<string name="pref_long_timeout_title">Long press timeout</string>
-	<string name="pref_long_timeout_summary">%sms</string>
-	<string name="pref_long_interval_title">Long press interval</string>
-	<string name="pref_long_interval_summary">%sms</string>
-
-	<string name="pref_category_vibrate">Vibration</string>
-	<string name="pref_vibrate_title">Vibration</string>
-	<string name="pref_vibrate_summary">Enable/Disable vibrations on key down</string>
-	<string name="pref_vibrate_duration_title">Duration</string>
-	<string name="pref_vibrate_duration_summary">%sms</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_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Enable/disable vibration on keypress</string>
   <string name="pref_precise_repeat_title">Precise cursor movements</string>
-  <string name="pref_precise_repeat_summary">Modulate the speed of movements by swiping more or less</string>
-
-	<string name="pref_category_style">Style</string>
-	<string name="pref_margin_bottom_title">Margin bottom</string>
-	<string name="pref_margin_bottom_summary">%sdp</string>
-	<string name="pref_key_height_title">Key height</string>
-	<string name="pref_key_height_summary">%sdp</string>
-	<string name="pref_horizontal_margin_title">Horizontal margin</string>
-	<string name="pref_horizontal_margin_summary">%sdp</string>
+  <string name="pref_precise_repeat_summary">Modulate key repeat speed by swiping more or less</string>
+  <string name="pref_lockable_keys_title">Lockable modifiers</string>
+  <string name="pref_lockable_keys_summary">Modifiers that can be locked by typing them twice</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>
+  <string name="pref_theme">Theme</string>
+  <string name="pref_theme_e_system">System settings</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">Very short</string>
+  <string name="pref_swipe_dist_e_short">Short</string>
+  <string name="pref_swipe_dist_e_default">Normal</string>
+  <string name="pref_swipe_dist_e_far">Far</string>
+  <string name="pref_swipe_dist_e_very_far">Very far</string>
+  <string name="pref_key_horizontal_space">Horizontal spacing between the keys</string>
+  <string name="pref_key_vertical_space">Vertical spacing between the keys</string>
+  <string name="key_action_next">Next</string>
+  <string name="key_action_done">Done</string>
+  <string name="key_action_go">Go</string>
+  <string name="key_action_prev">Prev</string>
+  <string name="key_action_search">Search</string>
+  <string name="key_action_send">Send</string>
 </resources>

res/values/styles.xml

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="emojiTypeButton">
-		<item name="android:padding">1px</item>
-		<item name="android:gravity">center</item>
-		<item name="android:minHeight">@dimen/label_text_size</item>
-		<item name="android:background">@color/emoji_button_bg</item>
-		<item name="android:textColor">@color/emoji_key_text</item>
-		<item name="android:textSize">@dimen/label_text_size</item>
-	</style>
-	<style name="emojiKeyButton">
-		<item name="android:layout_width">0px</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:padding">0px</item>
-		<item name="android:background">@color/emoji_key_bg</item>
-		<item name="android:textColor">@color/emoji_key_text</item>
-		<item name="android:textSize">@dimen/label_text_size</item>
-	</style>
+  <style name="emojiTypeButton">
+    <item name="android:padding">1px</item>
+    <item name="android:gravity">center</item>
+    <item name="android:minHeight">18dp</item>
+    <item name="android:background">?attr/emoji_button_bg</item>
+    <item name="android:textColor">?attr/emoji_key_text</item>
+    <item name="android:textSize">18dp</item>
+  </style>
+  <style name="emojiKeyButton">
+    <item name="android:layout_width">0px</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:padding">0px</item>
+    <item name="android:background">?attr/emoji_key_bg</item>
+    <item name="android:textColor">?attr/emoji_key_text</item>
+    <item name="android:textSize">18dp</item>
+  </style>
+  <!-- Passed to TextView.setTextAppearance -->
+  <style name="emojiGridButton">
+    <item name="android:textSize">@dimen/emoji_text_size</item>
+    <item name="android:textColor">?attr/emoji_color</item>
+  </style>
 </resources>

res/values/themes.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <declare-styleable name="keyboard">
+    <!-- The background of the keyboard -->
+    <attr name="colorKeyboard" format="color"/>
+    <!-- Background of the keys -->
+    <attr name="colorKey" format="color"/>
+    <!-- Background of the keys when pressed -->
+    <attr name="colorKeyActivated" format="color"/>
+    <!-- Label colors -->
+    <attr name="colorLabel" format="color"/>
+    <attr name="colorLabelActivated" format="color"/>
+    <attr name="colorLabelLocked" format="color"/>
+    <!-- Corner labels -->
+    <attr name="colorSubLabel" format="color"/>
+    <!-- Dimens -->
+    <attr name="keyBorderRadius" format="dimension"/>
+    <!-- Emoji panel -->
+    <attr name="emoji_button_bg" type="color" format="color"/>
+    <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="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>
+    <item name="colorLabel">#ffffff</item>
+    <item name="colorLabelActivated">#3399ff</item>
+    <item name="colorLabelLocked">#33cc33</item>
+    <item name="colorSubLabel">#cccccc</item>
+    <item name="emoji_button_bg" type="color">#202020</item>
+    <item name="emoji_color" type="color">#ffffff</item>
+  </style>
+  <style name="Light" parent="BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#e3e3e3</item>
+    <item name="colorKey">#cccccc</item>
+    <item name="colorKeyActivated">#e3e3e3</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">#dedede</item>
+    <item name="emoji_color">#000000</item>
+  </style>
+  <style name="Black" parent="BaseTheme">
+    <item name="android:isLightTheme">false</item>
+    <item name="colorKeyboard">#000000</item>
+    <item name="colorKey">#000000</item>
+    <item name="colorKeyActivated">#333333</item>
+    <item name="colorLabel">#eeeeee</item>
+    <item name="colorLabelActivated">#009dff</item>
+    <item name="colorLabelLocked">#00ff26</item>
+    <item name="colorSubLabel">#bbbbbb</item>
+    <item name="keyBorderRadius">1dp</item>
+    <item name="emoji_button_bg">#000000</item>
+    <item name="emoji_color">#ffffff</item>
+  </style>
+</resources>

res/values/values.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <dimen name="horizontal_margin">3dp</dimen>
+  <dimen name="margin_top">3dp</dimen>
+  <dimen name="margin_bottom">7dp</dimen>
+  <dimen name="key_padding">2dp</dimen>
+  <dimen name="key_vertical_interval">2dp</dimen>
+  <dimen name="key_horizontal_interval">2dp</dimen>
+  <dimen name="key_height">51dp</dimen>
+  <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,44 +1,37 @@
 <?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="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="\@" />
-	</row>
-	<row>
-		<key key0="q" key1="tab" />
-		<key key0="s" />
-		<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="l" key2="%" />
-		<key key0="m" key4="*" />
-	</row>
-	<row>
-		<key width="2.0" key0="shift" />
-		<key key0="w" key3="&lt;" key4="&gt;" />
-		<key key0="x" />
-		<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 width="2.0" key0="backspace" key2="delete" />
-	</row>
-	<row height="0.95">
-		<key width="1.8" key0="ctrl" 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.2" key1="up" key2="right" key3="left" key4="down" />
-		<key width="1.8" key0="enter" />
-	</row>
+  <row>
+    <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" key3="\@" key4="f11_placeholder"/>
+    <key key0="p" key2="0" key3="f12_placeholder"/>
+  </row>
+  <row>
+    <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="$"/>
+    <key key0="l" key2="%"/>
+    <key key0="m" key3="*"/>
+  </row>
+  <row>
+    <key width="2.0" key0="shift"/>
+    <key key0="w" key3="&lt;" key4="&gt;"/>
+    <key key0="x"/>
+    <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
+    <key key0="v" key3=";" key4="."/>
+    <key key0="b" key3=":" key4="/"/>
+    <key key0="n" key1="loc accent_tilde" key2="§" key4="!"/>
+    <key width="2.0" key0="backspace" key2="delete"/>
+  </row>
 </keyboard>

res/xml/bottom_row.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <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="loc accent_trema" key2="loc accent_circonflexe" key3="{" key4="}"/>
+    <key key0="r" key3="[" key4="]"/>
+    <key key0="l" key2="=" key3="+" key4="loc £"/>
+    <key key0="backspace" key2="delete" width="1.5"/>
+  </row>
+  <row>
+    <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="loc ß"/>
+  </row>
+  <row>
+    <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="loc accent_cedille"/>
+    <key key0="b"/>
+    <key key0="m" key2="/" key3="\?"/>
+    <key key0="w"/>
+    <key key0="v"/>
+    <key key0="z" key2="-" key3="_"/>
+  </row>
+</keyboard>

res/xml/local_bgph1.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="\@" 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="о" 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="к" key2="ш" key3="[" key4="]"/>
+    <key key0="л" key1="щ" key2="|" key3="\\" key4="ю"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="з"/>
+    <key key0="ь" key3="ѝ"/>
+    <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/local_ru_jcuken.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <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" key3="{" key4="}" />
+    <key key0="х" key3="[" key4="]" key1="f11_placeholder" key2="f12_placeholder"/>
+
+  </row>
+  <row>
+    <key key0="ф" key1="tab" key2="`"/>
+    <key key0="ы"/>
+    <key key0="в"/>
+    <key key0="а"/>
+    <key key0="п"/>
+    <key key0="р"/>
+    <key key0="о"/>
+    <key key0="л"/>
+    <key key0="д" key2="-" key3="_"/>
+    <key key0="ж" key2="=" key3="+"/>
+    <key key0="э" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <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,33 +1,19 @@
 <?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="@string/subtype_label"
-      android:languageTag="en"
-      android:imeSubtypeLocale="en_US"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="fr"
-      android:imeSubtypeLocale="fr_FR"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|cedille|trema"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="es"
-      android:imeSubtypeLocale="es_ES"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|tilde|trema"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="it"
-      android:imeSubtypeLocale="it_IT"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu"
-    />
+<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=€"/>
+  <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=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="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_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|₺|ı|ğ"/>
 </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,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<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="8" key2="∞" />
-    <key key0="9" key2="π" />
-    <key width="0.75" key0="*" key1="√" key2="×" />
-    <key width="0.75" key0="/" key1="%" key3="÷" />
+    <key width="0.75" key0="esc" key2="~" key4="!"/>
+    <key width="0.75" key0="(" key2="[" key4="{"/>
+    <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="%" key3="÷"/>
   </row>
   <row>
-    <key width="0.75" key0="tab" key1=";" key2="|" key4="\\" />
-    <key width="0.75" key0=")" key2="]" key4="}" />
-    <key key0="4" />
-    <key key0="5" key1="up" key2="right" key3="left" key4="down" />
-    <key key0="6" />
-    <key width="0.75" key0="+" key1="Σ" key2="$" />
-    <key width="0.75" key0="-" key2="^" />
+    <key width="0.75" key0="tab" key2="|" key4="\\"/>
+    <key width="0.75" key0=")" key2="]" key4="}"/>
+    <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="-" key1="^"/>
   </row>
   <row>
-    <key shift="0.35" width="1.15" key0="shift" key2="fn" key4="alt" />
-    <key key0="1" key1="superscript" key3="subscript" />
-    <key key0="2" />
-    <key key0="3" />
-    <key width="1.15" key0="backspace" key2="delete" />
+    <key shift="0.35" width="1.15" 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"/>
   </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="." key2="," />
-    <key width="0.75" key0="space" key1="&quot;" key2="'" key4="_" />
-    <key width="1.5" key0="enter" key2="±" key3="=" />
+  <row height="0.95">
+    <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>
 </keyboard>

res/xml/qwerty.xml

@@ -1,44 +1,37 @@
 <?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="\#" />
-		<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" />
-	</row>
-	<row>
-		<key shift="0.5" key0="a" key1="tab" key2="`" />
-		<key key0="s" />
-		<key key0="d" key1="accent_grave" key3="accent_aigu" />
-		<key key0="f" />
-		<key key0="g" key2="-" key3="_" />
-		<key key0="h" key2="=" key3="+" />
-		<key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{" />
-		<key key0="k" key4="]" key3="[" />
-		<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="v" key2="&gt;" key3="," />
-		<key key0="b" key2="\?" key3="/" />
-		<key key0="n" key1="accent_tilde" key2=":" key3=";" />
-		<key key0="m" key2="&quot;" key3="'" />
-		<key width="1.5" key0="backspace" key2="delete" />
-	</row>
-	<row height="0.95">
-		<key width="1.8" key0="ctrl" 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.2" key1="up" key2="right" key3="left" key4="down" />
-		<key width="1.8" key0="enter" />
-	</row>
+  <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="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="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_es.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="\@"/>
+    <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" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <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" key2="-" key3="_"/>
+    <key key0="h" key2="=" key3="+"/>
+    <key key0="j" key1="accent_trema" key4="}" key3="{"/>
+    <key key0="k" key3="[" key4="]"/>
+    <key key0="l" key2="|" key3="\\"/>
+    <key key0="ñ" key1="·" 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="/" key4="¿"/>
+    <key key0="n" key1="accent_tilde" key2=":" key3=";"/>
+    <key key0="m" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

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" 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" 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

@@ -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="\@" key4="!"/>
+    <key key0="e" key1="ē" key2="3" key3="\#" key4="€"/>
+    <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;" 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="ā" 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="_"/>
+    <key key0="k" key1="ķ" key3="[" key4="]"/>
+    <key key0="l" key1="ļ" key2="|" key3="/" key4="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z" key1="ž"/>
+    <key key0="x"/>
+    <key key0="c" key1="č"/>
+    <key key0="v"/>
+    <key key0="b" key2="\?" key3="&lt;" key4="&gt;"/>
+    <key key0="n" key1="ņ" key2="`" key3=":" key4=";"/>
+    <key key0="m" key1="'" key2="&quot;" key3="," key4="."/>
+    <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

@@ -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="&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" 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"/>
+    <key key0="f" key1="~"/>
+    <key key0="g" key3="-"/>
+    <key key0="h" key3="+"/>
+    <key key0="j" key3="*"/>
+    <key key0="k" key3="/" key4="\\"/>
+    <key key0="l" key1="'" key3="\#"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="y" key1="&gt;" key2="|" key3="&lt;"/>
+    <key key0="x"/>
+    <key key0="c"/>
+    <key key0="v" />
+    <key key0="b" key1=";" key3=","/>
+    <key key0="n" key1=":" key3="."/>
+    <key key0="m" key1="_" />
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>

res/xml/qwertz_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" 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" 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,102 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory android:title="@string/pref_category_layout">
-    <ListPreference
-      android:key="layout"
-      android:title="@string/pref_layout_title"
-      android:summary="@string/pref_layout_summary"
-      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="@string/pref_accents_summary"
-      android:defaultValue="@string/pref_accents_default"
-      android:entries="@array/pref_accents_entries"
-      android:entryValues="@array/pref_accents_values" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/pref_category_typing">
-		<juloo.common.SlideBarPreference
-			android:key="sub_value_dist"
-			android:title="@string/pref_preci_title"
-			android:summary="@string/pref_preci_summary"
-			android:defaultValue="10.0"
-			min="5.0"
-			max="25.0"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="longpress_timeout"
-			android:title="@string/pref_long_timeout_title"
-			android:summary="@string/pref_long_timeout_summary"
-			android:defaultValue="600"
-			min="50"
-			max="2000"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="longpress_interval"
-			android:title="@string/pref_long_interval_title"
-			android:summary="@string/pref_long_interval_summary"
-			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="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="@string/pref_vibrate_duration_summary"
-			android:defaultValue="20"
-			min="5"
-			max="50"
-		/>
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/pref_category_style">
-		<juloo.common.IntSlideBarPreference
-			android:key="margin_bottom"
-			android:title="@string/pref_margin_bottom_title"
-			android:summary="@string/pref_margin_bottom_summary"
-			android:defaultValue="5"
-			min="0"
-			max="100"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="key_height"
-			android:title="@string/pref_key_height_title"
-			android:summary="@string/pref_key_height_summary"
-			android:defaultValue="50"
-			min="30"
-			max="60"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="horizontal_margin"
-			android:title="@string/pref_horizontal_margin_title"
-			android:summary="@string/pref_horizontal_margin_summary"
-			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"
-    />
-	</PreferenceCategory>
+  <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"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_category_typing">
+    <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"/>
+    <PreferenceScreen android:title="@string/pref_lockable_keys_title" android:summary="@string/pref_lockable_keys_summary">
+      <CheckBoxPreference android:key="lockable_shift" android:title="Shift" android:defaultValue="true"/>
+      <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"/>
+  </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"/>
+    <juloo.common.IntSlideBarPreference android:key="key_horizontal_space" android:title="@string/pref_key_horizontal_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
+  </PreferenceCategory>
 </PreferenceScreen>

shell.nix

@@ -4,18 +4,16 @@
   } }:
 
 let
+  jdk = pkgs.openjdk8;
 
   android = pkgs.androidenv.composeAndroidPackages {
     buildToolsVersions = [ "30.0.3" ];
-    platformVersions = [ "29" ];
+    platformVersions = [ "30" ];
     abiVersions = [ "armeabi-v7a" ];
   };
 
 in
-
 pkgs.mkShell {
-  buildInputs = with pkgs; [
-    findutils openjdk8 android.androidsdk
-  ];
+  buildInputs = [ pkgs.findutils jdk android.androidsdk pkgs.fontforge ];
   ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
 }

srcs/juloo.common/IntSlideBarPreference.java

@@ -11,106 +11,110 @@ import android.widget.TextView;
 import android.widget.SeekBar;
 
 /*
-** IntSlideBarPreference
-** -
-** Open a dialog showing a seekbar
-** -
-** xml attrs:
-**   android:defaultValue		Default value (int)
-**   min						min value (int)
-**   max						max value (int)
-** -
-** Summary field allow to show the current value using %s flag
-*/
+ ** IntSlideBarPreference
+ ** -
+ ** Open a dialog showing a seekbar
+ ** -
+ ** xml attrs:
+ **   android:defaultValue  Default value (int)
+ **   min                   min value (int)
+ **   max                   max value (int)
+ ** -
+ ** Summary field allow to show the current value using %s flag
+ */
 public class IntSlideBarPreference extends DialogPreference
-	implements SeekBar.OnSeekBarChangeListener
+  implements SeekBar.OnSeekBarChangeListener
 {
-	private LinearLayout	_layout;
-	private TextView		_textView;
-	private SeekBar			_seekBar;
+  private LinearLayout _layout;
+  private TextView _textView;
+  private SeekBar _seekBar;
 
-	private int				_min;
+  private int _min;
 
-	private String			_initialSummary;
+  private String _initialSummary;
 
-	public IntSlideBarPreference(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		_initialSummary = getSummary().toString();
-		_textView = new TextView(context);
-		_textView.setPadding(48, 40, 48, 40);
-		_seekBar = new SeekBar(context);
-		_seekBar.setOnSeekBarChangeListener(this);
-		_min = attrs.getAttributeIntValue(null, "min", 0);
-		int max = attrs.getAttributeIntValue(null, "max", 0);
-		_seekBar.setMax(max - _min);
-		_layout = new LinearLayout(getContext());
-		_layout.setOrientation(LinearLayout.VERTICAL);
-		_layout.addView(_textView);
-		_layout.addView(_seekBar);
-	}
+  public IntSlideBarPreference(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    _initialSummary = getSummary().toString();
+    _textView = new TextView(context);
+    _textView.setPadding(48, 40, 48, 40);
+    _seekBar = new SeekBar(context);
+    _seekBar.setOnSeekBarChangeListener(this);
+    _min = attrs.getAttributeIntValue(null, "min", 0);
+    int max = attrs.getAttributeIntValue(null, "max", 0);
+    _seekBar.setMax(max - _min);
+    _layout = new LinearLayout(getContext());
+    _layout.setOrientation(LinearLayout.VERTICAL);
+    _layout.addView(_textView);
+    _layout.addView(_seekBar);
+  }
 
-	@Override
-	public void				onProgressChanged(SeekBar seekBar, int progress, boolean fromUser)
-	{
-		updateText();
-	}
+  @Override
+  public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser)
+  {
+    updateText();
+  }
 
-	@Override
-	public void				onStartTrackingTouch(SeekBar seekBar)
-	{
-	}
+  @Override
+  public void onStartTrackingTouch(SeekBar seekBar)
+  {
+  }
 
-	@Override
-	public void				onStopTrackingTouch(SeekBar seekBar)
-	{
-	}
+  @Override
+  public void onStopTrackingTouch(SeekBar seekBar)
+  {
+  }
 
-	@Override
-	protected void			onSetInitialValue(boolean restorePersistedValue, Object defaultValue)
-	{
-		int				value;
+  @Override
+  protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue)
+  {
+    int value;
 
-		if (restorePersistedValue)
-		{
-			value = getPersistedInt(_min);
-		}
-		else
-		{
-			value = (Integer)defaultValue;
-			persistInt(value);
-		}
-		_seekBar.setProgress(value - _min);
-		updateText();
-	}
+    if (restorePersistedValue)
+    {
+      value = getPersistedInt(_min);
+    }
+    else
+    {
+      value = (Integer)defaultValue;
+      persistInt(value);
+    }
+    _seekBar.setProgress(value - _min);
+    updateText();
+  }
 
-	@Override
-	protected Object		onGetDefaultValue(TypedArray a, int index)
-	{
-		return (a.getInt(index, _min));
-	}
+  @Override
+  protected Object onGetDefaultValue(TypedArray a, int index)
+  {
+    return (a.getInt(index, _min));
+  }
 
-	@Override
-	protected void			onDialogClosed(boolean positiveResult)
-	{
-		if (positiveResult)
-			persistInt(_seekBar.getProgress() + _min);
-	}
+  @Override
+  protected void onDialogClosed(boolean positiveResult)
+  {
+    if (positiveResult)
+      persistInt(_seekBar.getProgress() + _min);
+    else
+      _seekBar.setProgress(getPersistedInt(_min) - _min);
 
-	protected View			onCreateDialogView()
-	{
-		ViewGroup		parent = (ViewGroup)_layout.getParent();
+    updateText();
+  }
 
-		if (parent != null)
-			parent.removeView(_layout);
-		return (_layout);
-	}
+  protected View onCreateDialogView()
+  {
+    ViewGroup parent = (ViewGroup)_layout.getParent();
 
-	private void			updateText()
-	{
-		String			f = String.format(_initialSummary, _seekBar.getProgress() + _min);
+    if (parent != null)
+      parent.removeView(_layout);
+    return (_layout);
+  }
 
-		_textView.setText(f);
-		setSummary(f);
-	}
+  private void updateText()
+  {
+    String f = String.format(_initialSummary, _seekBar.getProgress() + _min);
+
+    _textView.setText(f);
+    setSummary(f);
+  }
 }

srcs/juloo.common/SlideBarPreference.java

@@ -11,117 +11,121 @@ import android.widget.TextView;
 import android.widget.SeekBar;
 
 /*
-** SideBarPreference
-** -
-** Open a dialog showing a seekbar
-** -
-** xml attrs:
-**   android:defaultValue		Default value (float)
-**   min						min value (float)
-**   max						max value (float)
-** -
-** Summary field allow to show the current value using %f or %s flag
-*/
+ ** SideBarPreference
+ ** -
+ ** Open a dialog showing a seekbar
+ ** -
+ ** xml attrs:
+ **   android:defaultValue  Default value (float)
+ **   min                   min value (float)
+ **   max                   max value (float)
+ ** -
+ ** Summary field allow to show the current value using %f or %s flag
+ */
 public class SlideBarPreference extends DialogPreference
-	implements SeekBar.OnSeekBarChangeListener
+  implements SeekBar.OnSeekBarChangeListener
 {
-	private static final int	STEPS = 100;
+  private static final int STEPS = 100;
 
-	private LinearLayout	_layout;
-	private TextView		_textView;
-	private SeekBar			_seekBar;
+  private LinearLayout _layout;
+  private TextView _textView;
+  private SeekBar _seekBar;
 
-	private float			_min;
-	private float			_max;
-	private float			_value;
+  private float _min;
+  private float _max;
+  private float _value;
 
-	private String			_initialSummary;
+  private String _initialSummary;
 
-	public SlideBarPreference(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		_initialSummary = getSummary().toString();
-		_textView = new TextView(context);
-		_textView.setPadding(48, 40, 48, 40);
-		_seekBar = new SeekBar(context);
-		_seekBar.setOnSeekBarChangeListener(this);
-		_seekBar.setMax(STEPS);
-		_min = float_of_string(attrs.getAttributeValue(null, "min"));
-		_value = _min;
-		_max = Math.max(1f, float_of_string(attrs.getAttributeValue(null, "max")));
-		_layout = new LinearLayout(getContext());
-		_layout.setOrientation(LinearLayout.VERTICAL);
-		_layout.addView(_textView);
-		_layout.addView(_seekBar);
-	}
+  public SlideBarPreference(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    _initialSummary = getSummary().toString();
+    _textView = new TextView(context);
+    _textView.setPadding(48, 40, 48, 40);
+    _seekBar = new SeekBar(context);
+    _seekBar.setOnSeekBarChangeListener(this);
+    _seekBar.setMax(STEPS);
+    _min = float_of_string(attrs.getAttributeValue(null, "min"));
+    _value = _min;
+    _max = Math.max(1f, float_of_string(attrs.getAttributeValue(null, "max")));
+    _layout = new LinearLayout(getContext());
+    _layout.setOrientation(LinearLayout.VERTICAL);
+    _layout.addView(_textView);
+    _layout.addView(_seekBar);
+  }
 
-	@Override
-	public void				onProgressChanged(SeekBar seekBar, int progress, boolean fromUser)
-	{
-		_value = Math.round(progress * (_max - _min)) / (float)STEPS + _min;
-		updateText();
-	}
+  @Override
+  public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser)
+  {
+    _value = Math.round(progress * (_max - _min)) / (float)STEPS + _min;
+    updateText();
+  }
 
-	@Override
-	public void				onStartTrackingTouch(SeekBar seekBar)
-	{
-	}
+  @Override
+  public void onStartTrackingTouch(SeekBar seekBar)
+  {
+  }
 
-	@Override
-	public void				onStopTrackingTouch(SeekBar seekBar)
-	{
-	}
+  @Override
+  public void onStopTrackingTouch(SeekBar seekBar)
+  {
+  }
 
-	@Override
-	protected void			onSetInitialValue(boolean restorePersistedValue, Object defaultValue)
-	{
-		if (restorePersistedValue)
-		{
-			_value = getPersistedFloat(_min);
-		}
-		else
-		{
-			_value = (Float)defaultValue;
-			persistFloat(_value);
-		}
-		_seekBar.setProgress((int)((_value - _min) * STEPS / (_max - _min)));
-		updateText();
-	}
+  @Override
+  protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue)
+  {
+    if (restorePersistedValue)
+    {
+      _value = getPersistedFloat(_min);
+    }
+    else
+    {
+      _value = (Float)defaultValue;
+      persistFloat(_value);
+    }
+    _seekBar.setProgress((int)((_value - _min) * STEPS / (_max - _min)));
+    updateText();
+  }
 
-	@Override
-	protected Object		onGetDefaultValue(TypedArray a, int index)
-	{
-		return (a.getFloat(index, _min));
-	}
+  @Override
+  protected Object onGetDefaultValue(TypedArray a, int index)
+  {
+    return (a.getFloat(index, _min));
+  }
 
-	@Override
-	protected void			onDialogClosed(boolean positiveResult)
-	{
-		if (positiveResult)
-			persistFloat(_value);
-	}
+  @Override
+  protected void onDialogClosed(boolean positiveResult)
+  {
+    if (positiveResult)
+      persistFloat(_value);
+    else
+      _seekBar.setProgress((int)((getPersistedFloat(_min) - _min) * STEPS / (_max - _min)));
 
-	protected View			onCreateDialogView()
-	{
-		ViewGroup		parent = (ViewGroup)_layout.getParent();
+    updateText();
+  }
 
-		if (parent != null)
-			parent.removeView(_layout);
-		return (_layout);
-	}
+  protected View onCreateDialogView()
+  {
+    ViewGroup parent = (ViewGroup)_layout.getParent();
 
-	private void			updateText()
-	{
-		String			f = String.format(_initialSummary, _value);
+    if (parent != null)
+      parent.removeView(_layout);
+    return (_layout);
+  }
 
-		_textView.setText(f);
-		setSummary(f);
-	}
+  private void updateText()
+  {
+    String f = String.format(_initialSummary, _value);
 
-	private static float	float_of_string(String str)
-	{
-		if (str == null)
-			return (0f);
-		return (Float.parseFloat(str));
-	}
+    _textView.setText(f);
+    setSummary(f);
+  }
+
+  private static float float_of_string(String str)
+  {
+    if (str == null)
+      return (0f);
+    return (Float.parseFloat(str));
+  }
 }

srcs/juloo.keyboard2/Config.java

@@ -1,124 +1,286 @@
 package juloo.keyboard2;
 
+import android.content.Context;
 import android.content.res.Resources;
+import android.content.res.Configuration;
 import android.content.SharedPreferences;
+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;
 
-class Config
+final class Config
 {
-	private Keyboard2			_context;
-
   // From resources
-	public final float			marginTop;
-	public final float			keyPadding;
-	public final float			keyVerticalInterval;
-	public final float			keyHorizontalInterval;
-	public final float			keyRound;
+  public final float marginTop;
+  public final float keyPadding;
+
+  public final float labelTextSize;
+  public final float sublabelTextSize;
 
   // From preferences
   public int layout; // Or '-1' for the system defaults
-	public float				subValueDist;
-	public boolean				vibrateEnabled;
-	public long					vibrateDuration;
-	public long					longPressTimeout;
-	public long					longPressInterval;
-	public float				marginBottom;
-	public float				keyHeight;
-	public float				horizontalMargin;
+  public int programming_layout; // Or '-1' for none
+  public float swipe_dist_px;
+  public boolean vibrateEnabled;
+  public long longPressTimeout;
+  public long longPressInterval;
+  public float marginBottom;
+  public float keyHeight;
+  public float horizontalMargin;
+  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.*
 
   // Dynamically set
   public boolean shouldOfferSwitchingToNextInputMethod;
-  public int accent_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; // 'null' means all the keys
 
-	public Config(Keyboard2 context)
-	{
-		Resources			res = context.getResources();
+  public final IKeyEventHandler handler;
 
-		_context = context;
-		// static values
-		marginTop = res.getDimension(R.dimen.margin_top);
-		keyPadding = res.getDimension(R.dimen.key_padding);
-		keyVerticalInterval = res.getDimension(R.dimen.key_vertical_interval);
-		keyHorizontalInterval = res.getDimension(R.dimen.key_horizontal_interval);
-		keyRound = res.getDimension(R.dimen.key_round);
-		// default values
+  private Config(Context context, IKeyEventHandler h)
+  {
+    Resources res = context.getResources();
+    // static values
+    marginTop = res.getDimension(R.dimen.margin_top);
+    keyPadding = res.getDimension(R.dimen.key_padding);
+    labelTextSize = 0.33f;
+    sublabelTextSize = 0.22f;
+    // default values
     layout = -1;
-		subValueDist = 10f;
-		vibrateEnabled = true;
-		vibrateDuration = 20;
-		longPressTimeout = 600;
-		longPressInterval = 65;
-		marginBottom = res.getDimension(R.dimen.margin_bottom);
-		keyHeight = res.getDimension(R.dimen.key_height);
-		horizontalMargin = res.getDimension(R.dimen.horizontal_margin);
+    programming_layout = -1;
+    vibrateEnabled = true;
+    longPressTimeout = 600;
+    longPressInterval = 65;
+    marginBottom = res.getDimension(R.dimen.margin_bottom);
+    keyHeight = res.getDimension(R.dimen.key_height);
+    horizontalMargin = res.getDimension(R.dimen.horizontal_margin);
+    keyVerticalInterval = res.getDimension(R.dimen.key_vertical_interval);
+    keyHorizontalInterval = res.getDimension(R.dimen.key_horizontal_interval);
     preciseRepeat = true;
     characterSize = 1.f;
     accents = 1;
-		// from prefs
-		refresh();
+    // from prefs
+    refresh(context);
     // initialized later
     shouldOfferSwitchingToNextInputMethod = false;
-    accent_flags_to_remove = 0;
-	}
+    shouldOfferSwitchingToProgramming = false;
+    actionLabel = null;
+    actionId = 0;
+    swapEnterActionKey = false;
+    extra_keys = null;
+    handler = h;
+  }
 
-	/*
-	** Reload prefs
-	*/
-	public void			refresh()
-	{
-		SharedPreferences	prefs = PreferenceManager.getDefaultSharedPreferences(_context);
-
-    layout = layoutId_of_string(prefs.getString("layout", "system")); 
-		subValueDist = prefs.getFloat("sub_value_dist", subValueDist);
-		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(prefs, "margin_bottom", marginBottom);
-		keyHeight = getDipPref(prefs, "key_height", keyHeight);
-		horizontalMargin = getDipPref(prefs, "horizontal_margin", horizontalMargin);
+  /*
+   ** Reload prefs
+   */
+  public void refresh(Context context)
+  {
+    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 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 = prefs.getInt("keyboard_height_landscape", 50);
+      horizontalIntervalScale = 2.f;
+      characterSizeScale = 1.25f;
+    }
+    else
+    {
+      keyboardHeightPercent = prefs.getInt("keyboard_height", 35);
+    }
+    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);
+    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)
+      * 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);
     preciseRepeat = prefs.getBoolean("precise_repeat", preciseRepeat);
-    characterSize = prefs.getFloat("character_size", characterSize); 
+    lockable_modifiers.clear();
+    if (prefs.getBoolean("lockable_shift", true)) 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", ""));
+  }
 
-	private float		getDipPref(SharedPreferences prefs, String pref_name, float def)
-	{
-		int					value = prefs.getInt(pref_name, -1);
+  /** 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>(this.extra_keys);
+    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;
+  }
 
-		if (value < 0)
-			return (def);
-		return (TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value,
-			_context.getResources().getDisplayMetrics()));
-	}
+  private float getDipPref(DisplayMetrics dm, SharedPreferences prefs, String pref_name, float def)
+  {
+    float value;
+    try { value = prefs.getInt(pref_name, -1); }
+    catch (Exception e) { value = prefs.getFloat(pref_name, -1f); }
+    if (value < 0f)
+      return (def);
+    return (TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value, dm));
+  }
+
+  private int getThemeId(Resources res, String theme_name)
+  {
+    switch (theme_name)
+    {
+      case "light": return R.style.Light;
+      case "black": return R.style.Black;
+      case "dark": return R.style.Dark;
+      default:
+      case "system":
+        if (Build.VERSION.SDK_INT >= 8)
+        {
+          int night_mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+          if ((night_mode & Configuration.UI_MODE_NIGHT_NO) != 0)
+            return R.style.Light;
+        }
+        return R.style.Dark;
+    }
+  }
 
   public static int layoutId_of_string(String name)
   {
     switch (name)
     {
       case "azerty": return R.xml.azerty;
+      case "bgph1": return R.xml.local_bgph1;
+      case "colemak": return R.xml.colemak;
+      case "dvorak": return R.xml.dvorak;
+      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 "system": return -1;
-      default: throw new IllegalArgumentException();
+      case "qwerty_sv_se": return R.xml.qwerty_sv_se;
+      case "qwertz_hu": return R.xml.qwertz_hu;
+      case "qwertz": return R.xml.qwertz;
+      case "ru_jcuken": return R.xml.local_ru_jcuken;
+      default: return R.xml.qwerty; // The config might store an invalid layout, don't crash
     }
   }
 
-  /* Used for the accents option. */
-  public static int accentFlag_of_name(String name)
+  public static int themeId_of_string(String name)
   {
     switch (name)
     {
-      case "grave": return KeyValue.FLAG_ACCENT1;
-      case "aigu": return KeyValue.FLAG_ACCENT2;
-      case "circonflexe": return KeyValue.FLAG_ACCENT3;
-      case "tilde": return KeyValue.FLAG_ACCENT4;
-      case "cedille": return KeyValue.FLAG_ACCENT5;
-      case "trema": return KeyValue.FLAG_ACCENT6;
-      default: throw new RuntimeException(name);
+      case "light": return R.style.Light;
+      case "black": return R.style.Black;
+      default: case "dark": return R.style.Dark;
     }
   }
+
+  private static Config _globalConfig = null;
+
+  public static void initGlobalConfig(Context context, IKeyEventHandler handler)
+  {
+    _globalConfig = new Config(context, handler);
+  }
+
+  public static Config globalConfig()
+  {
+    return _globalConfig;
+  }
+
+  public static interface IKeyEventHandler
+  {
+    public void handleKeyUp(KeyValue value, Pointers.Modifiers flags);
+  }
 }

srcs/juloo.keyboard2/Emoji.java

@@ -8,37 +8,50 @@ import java.io.BufferedReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-public class Emoji extends KeyValue
+public class Emoji
 {
-	private final String	_desc;
+  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);
-		_desc = desc;
+  protected Emoji(String name, String bytecode, String desc)
+  {
+    _name = name;
+    _kv = new KeyValue(bytecode, KeyValue.KIND_STRING, 0, 0);
+    _desc = desc;
     emojis_by_name.put(name, this);
-	}
+  }
 
-	public String			getDescription()
-	{
-		return (_desc);
-	}
+  public String name()
+  {
+    return _name;
+  }
+
+  public KeyValue kv()
+  {
+    return _kv;
+  }
+
+  public String getDescription()
+  {
+    return (_desc);
+  }
 
   public static int num_groups = 0;
 
   private static Emoji[][] emojis_by_group = new Emoji[][]{};
 
-	public static Emoji		getEmojiByName(String name)
-	{
+  public static Emoji getEmojiByName(String name)
+  {
     return emojis_by_name.get(name);
-	}
+  }
 
-	public static Emoji[]	getEmojisByGroup(int group_id)
-	{
-		return (emojis_by_group[group_id]);
-	}
+  public static Emoji[] getEmojisByGroup(int group_id)
+  {
+    return (emojis_by_group[group_id]);
+  }
 
   /* Read the list of emojis from a raw file. Will initialize only once. */
   public static void init(Resources res)

srcs/juloo.keyboard2/EmojiGridView.java

@@ -19,158 +19,154 @@ import java.util.Set;
 import java.util.HashSet;
 
 public class EmojiGridView extends GridView
-	implements GridView.OnItemClickListener
+  implements GridView.OnItemClickListener
 {
-	public static final int			GROUP_LAST_USE = -1;
+  public static final int GROUP_LAST_USE = -1;
 
-	public static final int			COLUMN_WIDTH = 192;
-	public static final float		EMOJI_SIZE = 32.f;
+  public static final int COLUMN_WIDTH = 192;
 
-	private static final String		LAST_USE_PREF = "emoji_last_use";
+  private static final String LAST_USE_PREF = "emoji_last_use";
 
-	private Emoji[]					_emojiArray;
-	private HashMap<Emoji, Integer>	_lastUsed;
+  private Emoji[] _emojiArray;
+  private HashMap<Emoji, Integer> _lastUsed;
 
-	/*
-	** TODO: adapt column width and emoji size
-	** TODO: use ArraySet instead of Emoji[]
-	*/
-	public EmojiGridView(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
+  /*
+   ** TODO: adapt column width and emoji size
+   ** TODO: use ArraySet instead of Emoji[]
+   */
+  public EmojiGridView(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
     Emoji.init(context.getResources());
-		setOnItemClickListener(this);
-		setColumnWidth(COLUMN_WIDTH);
-		loadLastUsed();
-		setEmojiGroup((_lastUsed.size() == 0) ? 0 : GROUP_LAST_USE);
-	}
+    setOnItemClickListener(this);
+    setColumnWidth(COLUMN_WIDTH);
+    loadLastUsed();
+    setEmojiGroup((_lastUsed.size() == 0) ? 0 : GROUP_LAST_USE);
+  }
 
-	public void			setEmojiGroup(int group)
-	{
-		_emojiArray = (group == GROUP_LAST_USE) ? getLastEmojis() : Emoji.getEmojisByGroup(group);
-		setAdapter(new EmojiViewAdpater((Keyboard2)getContext(), _emojiArray));
-	}
+  public void setEmojiGroup(int group)
+  {
+    _emojiArray = (group == GROUP_LAST_USE) ? getLastEmojis() : Emoji.getEmojisByGroup(group);
+    setAdapter(new EmojiViewAdpater(getContext(), _emojiArray));
+  }
 
-	public void			onItemClick(AdapterView<?> parent, View v, int pos, long id)
-	{
-		Keyboard2			main = (Keyboard2)getContext();
-		Integer				used = _lastUsed.get(_emojiArray[pos]);
+  public void onItemClick(AdapterView<?> parent, View v, int pos, long id)
+  {
+    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].kv(), Pointers.Modifiers.EMPTY);
+    saveLastUsed(); // TODO: opti
+  }
 
-		_lastUsed.put(_emojiArray[pos], (used == null) ? 1 : used.intValue() + 1);
-		main.handleKeyUp(_emojiArray[pos], 0);
-		saveLastUsed(); // TODO: opti
-	}
+  @Override
+  public void onMeasure(int wSpec, int hSpec)
+  {
+    super.onMeasure(wSpec, hSpec);
+    setNumColumns(getMeasuredWidth() / COLUMN_WIDTH);
+  }
 
-	@Override
-	public void			onMeasure(int wSpec, int hSpec)
-	{
-		super.onMeasure(wSpec, hSpec);
-		setNumColumns(getMeasuredWidth() / COLUMN_WIDTH);
-	}
+  private Emoji[] getLastEmojis()
+  {
+    final HashMap<Emoji, Integer> map = _lastUsed;
+    Emoji[] array = new Emoji[map.size()];
 
-	private Emoji[]		getLastEmojis()
-	{
-		final HashMap<Emoji, Integer>	map = _lastUsed;
-		Emoji[]							array = new Emoji[map.size()];
+    map.keySet().toArray(array);
+    Arrays.sort(array, 0, array.length, new Comparator<Emoji>()
+        {
+          public int compare(Emoji a, Emoji b)
+          {
+            return (map.get(b).intValue() - map.get(a).intValue());
+          }
+        });
+    return (array);
+  }
 
-		map.keySet().toArray(array);
-		Arrays.sort(array, 0, array.length, new Comparator<Emoji>()
-		{
-			public int		compare(Emoji a, Emoji b)
-			{
-				return (map.get(b).intValue() - map.get(a).intValue());
-			}
-		});
-		return (array);
-	}
+  private void saveLastUsed()
+  {
+    SharedPreferences.Editor edit = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
+    HashSet<String> set = new HashSet<String>();
 
-	private void		saveLastUsed()
-	{
-		SharedPreferences.Editor	edit = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
-		HashSet<String>				set = new HashSet<String>();
+    for (Emoji emoji : _lastUsed.keySet())
+      set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name());
+    edit.putStringSet(LAST_USE_PREF, set);
+    edit.apply();
+  }
 
-		for (Emoji emoji : _lastUsed.keySet())
-			set.add(String.valueOf(_lastUsed.get(emoji)) + "-" + emoji.name);
-		edit.putStringSet(LAST_USE_PREF, set);
-		edit.apply();
-	}
+  private void loadLastUsed()
+  {
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+    Set<String> lastUseSet = prefs.getStringSet(LAST_USE_PREF, null);
 
-	private void		loadLastUsed()
-	{
-		SharedPreferences	prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-		Set<String>			lastUseSet = prefs.getStringSet(LAST_USE_PREF, null);
+    _lastUsed = new HashMap<Emoji, Integer>();
+    if (lastUseSet != null)
+      for (String emojiData : lastUseSet)
+      {
+        String[] data = emojiData.split("-", 2);
+        Emoji emoji;
 
-		_lastUsed = new HashMap<Emoji, Integer>();
-		if (lastUseSet != null)
-			for (String emojiData : lastUseSet)
-			{
-				String[]	data = emojiData.split("-", 2);
-				Emoji		emoji;
+        if (data.length != 2)
+          continue ;
+        emoji = Emoji.getEmojiByName(data[1]);
+        if (emoji == null)
+          continue ;
+        _lastUsed.put(emoji, Integer.valueOf(data[0]));
+      }
+  }
 
-				if (data.length != 2)
-					continue ;
-				emoji = Emoji.getEmojiByName(data[1]);
-				if (emoji == null)
-					continue ;
-				_lastUsed.put(emoji, Integer.valueOf(data[0]));
-			}
-	}
+  private static class EmojiView extends TextView
+  {
+    public EmojiView(Context context)
+    {
+      super(context);
+      setTextAppearance(context, R.style.emojiGridButton);
+      setGravity(Gravity.CENTER);
+      setLayoutParams(new GridView.LayoutParams(GridView.LayoutParams.WRAP_CONTENT, GridView.LayoutParams.WRAP_CONTENT));
+    }
 
-	private static class EmojiView extends TextView
-	{
-		public EmojiView(Keyboard2 context)
-		{
-			super(context);
-			setTextSize(EMOJI_SIZE);
-			setGravity(Gravity.CENTER);
-			setBackgroundColor(0x0);
-			setTextColor(getResources().getColor(R.color.emoji_color));
-			setLayoutParams(new GridView.LayoutParams(GridView.LayoutParams.WRAP_CONTENT, GridView.LayoutParams.WRAP_CONTENT));
-		}
+    public void setEmoji(Emoji emoji)
+    {
+      setText(emoji.kv().getString());
+    }
+  }
 
-		public void			setEmoji(Emoji emoji)
-		{
-			setText(emoji.symbol);
-		}
-	}
+  private static class EmojiViewAdpater extends BaseAdapter
+  {
+    private Context _context;
 
-	private static class EmojiViewAdpater extends BaseAdapter
-	{
-		private Keyboard2		_main;
+    private Emoji[] _emojiArray;
 
-		private Emoji[]			_emojiArray;
+    public EmojiViewAdpater(Context context, Emoji[] emojiArray)
+    {
+      _context = context;
+      _emojiArray = emojiArray;
+    }
 
-		public EmojiViewAdpater(Keyboard2 main, Emoji[] emojiArray)
-		{
-			_main = main;
-			_emojiArray = emojiArray;
-		}
+    public int getCount()
+    {
+      if (_emojiArray == null)
+        return (0);
+      return (_emojiArray.length);
+    }
 
-		public int			getCount()
-		{
-			if (_emojiArray == null)
-				return (0);
-			return (_emojiArray.length);
-		}
+    public Object getItem(int pos)
+    {
+      return (_emojiArray[pos]);
+    }
 
-		public Object		getItem(int pos)
-		{
-			return (_emojiArray[pos]);
-		}
+    public long getItemId(int pos)
+    {
+      return (pos);
+    }
 
-		public long			getItemId(int pos)
-		{
-			return (pos);
-		}
+    public View getView(int pos, View convertView, ViewGroup parent)
+    {
+      EmojiView view = (EmojiView)convertView;
 
-		public View			getView(int pos, View convertView, ViewGroup parent)
-		{
-			EmojiView			view = (EmojiView)convertView;
-
-			if (view == null)
-				view = new EmojiView(_main);
-			view.setEmoji(_emojiArray[pos]);
-			return (view);
-		}
-	}
+      if (view == null)
+        view = new EmojiView(_context);
+      view.setEmoji(_emojiArray[pos]);
+      return (view);
+    }
+  }
 }

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

@@ -6,24 +6,24 @@ import android.view.View;
 import android.widget.Button;
 
 public class EmojiKeyButton extends Button
-	implements View.OnClickListener
+  implements View.OnClickListener
 {
-	KeyValue		_key;
+  KeyValue _key;
 
-	public EmojiKeyButton(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		setOnClickListener(this);
-		_key = KeyValue.getKeyByName(attrs.getAttributeValue(null, "key"));
-		setText(_key.symbol);
-		if ((_key.flags & KeyValue.FLAG_KEY_FONT) != 0)
-			setTypeface(((Keyboard2)context).getSpecialKeyFont());
-	}
+  public EmojiKeyButton(Context context, AttributeSet attrs)
+  {
+    super(context, attrs);
+    setOnClickListener(this);
+    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.getSpecialKeyFont(context));
+  }
 
-	public void			onClick(View v)
-	{
-		Keyboard2			main = (Keyboard2)getContext();
-
-		main.handleKeyUp(_key, 0);
-	}
+  public void onClick(View v)
+  {
+    Config config = Config.globalConfig();
+    config.handler.handleKeyUp(_key, Pointers.Modifiers.EMPTY);
+  }
 }

srcs/juloo.keyboard2/EmojiTypeButton.java

@@ -10,28 +10,28 @@ import android.widget.Button;
 /* Emoji "types" are groups. This class is misnamed. */
 
 public class EmojiTypeButton extends Button
-	implements View.OnTouchListener
+  implements View.OnTouchListener
 {
-	private int		_emojiType;
+  private int _emojiType;
 
   static private final int DEFAULT_GROUP = 0;
 
-	public EmojiTypeButton(Context context, int group_id, String symbol)
-	{
-		super(new ContextThemeWrapper(context, R.style.emojiTypeButton), null, 0);
+  public EmojiTypeButton(Context context, int group_id, String symbol)
+  {
+    super(new ContextThemeWrapper(context, R.style.emojiTypeButton), null, 0);
     _emojiType = group_id;
-		setText(symbol);
-		setOnTouchListener(this);
-	}
+    setText(symbol);
+    setOnTouchListener(this);
+  }
 
-	public boolean			onTouch(View view, MotionEvent event)
-	{
-		EmojiGridView	emojiGrid;
+  public boolean onTouch(View view, MotionEvent event)
+  {
+    EmojiGridView emojiGrid;
 
-		if (event.getAction() != MotionEvent.ACTION_DOWN)
-			return (false);
-		emojiGrid = (EmojiGridView)((ViewGroup)(getParent().getParent())).findViewById(R.id.emoji_grid);
-		emojiGrid.setEmojiGroup(_emojiType);
-		return (true);
-	}
+    if (event.getAction() != MotionEvent.ACTION_DOWN)
+      return (false);
+    emojiGrid = (EmojiGridView)((ViewGroup)(getParent().getParent())).findViewById(R.id.emoji_grid);
+    emojiGrid.setEmojiGroup(_emojiType);
+    return (true);
+  }
 }

srcs/juloo.keyboard2/KeyEventHandler.java

@@ -0,0 +1,114 @@
+package juloo.keyboard2;
+
+import android.view.KeyEvent;
+
+class KeyEventHandler implements Config.IKeyEventHandler
+{
+  private IReceiver _recv;
+
+  public KeyEventHandler(IReceiver recv)
+  {
+    _recv = recv;
+  }
+
+  public void handleKeyUp(KeyValue key, Pointers.Modifiers mods)
+  {
+    if (key == null)
+      return;
+    switch (key.getKind())
+    {
+      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;
+        }
+        break;
+      case Keyevent:
+        handleKeyUpWithModifier(key.getKeyevent(), mods);
+        break;
+      case Modifier:
+        break;
+    }
+  }
+
+  // private void handleDelKey(int before, int after)
+  // {
+  //  CharSequence selection = getCurrentInputConnection().getSelectedText(0);
+
+  //  if (selection != null && selection.length() > 0)
+  //  getCurrentInputConnection().commitText("", 1);
+  //  else
+  //  getCurrentInputConnection().deleteSurroundingText(before, after);
+  // }
+
+  private int sendMetaKey(int eventCode, int metaFlags, int metaState, boolean down)
+  {
+    int action;
+    int updatedMetaState;
+    if (down) { action = KeyEvent.ACTION_DOWN; updatedMetaState = metaState | metaFlags; }
+    else { action = KeyEvent.ACTION_UP; updatedMetaState = metaState & ~metaFlags; }
+    _recv.sendKeyEvent(action, eventCode, metaState);
+    return updatedMetaState;
+  }
+
+  private int sendMetaKeyForModifier(KeyValue.Modifier mod, int metaState, boolean down)
+  {
+    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(int keyCode, Pointers.Modifiers mods)
+	{
+    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
+  {
+    public void switchToNextInputMethod();
+    public void setPane_emoji();
+    public void setPane_normal();
+    public void showKeyboardConfig();
+    public void performAction();
+
+    public void switchMain();
+    public void switchNumeric();
+    public void switchProgramming();
+
+    public void sendKeyEvent(int eventAction, int eventCode, int meta);
+
+    public void commitText(String text);
+    public void commitChar(char c);
+  }
+}

srcs/juloo.keyboard2/KeyModifier.java

@@ -1,108 +1,364 @@
 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:
-        switch (c)
+      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 String:
+        switch (k.getString())
         {
-          case '`': return '´';
-          case '<': return '‘';
-          case '>': return '‘';
-          default: return (char)KeyCharacterMap.getDeadChar('\u00B4', c);
+          case "":
+            if (k == KeyValue.getKeyByName("f11_placeholder"))
+              name = "f11";
+            else if (k == KeyValue.getKeyByName("f12_placeholder"))
+              name = "f12";
+            break;
         }
-      case KeyValue.FLAG_ACCENT3:
+        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;
+    }
+  }
+
+  /** 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 "¿";
+      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
+      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 '║';
+      default: return c;
+    }
+  }
+
+  private static final Map_char map_char_double_aigu =
+    new Map_char() {
+      public char apply(char c)
+      {
         switch (c)
         {
+          // Composite characters: a̋ e̋ i̋ m̋ ӳ
+          case 'o': return 'ő';
+          case 'u': return 'ű';
+          case ' ': return '˝';
+          default: return c;
+        }
+      }
+    };
+
+  private static final Map_char map_char_ordinal =
+    new Map_char() {
+      public char apply(char c)
+      {
+        switch (c)
+        {
+          case 'a': return 'ª';
+          case 'o': return 'º';
+          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 '*': return '°';
-          default: return (char)KeyCharacterMap.getDeadChar('\u02C6', c);
+          default: return 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_SUPERSCRIPT:
+      }
+    };
+
+  private static final Map_char map_char_superscript =
+    new Map_char() {
+      public char apply(char c)
+      {
         switch (c)
         {
           case '1': return '¹';
@@ -124,7 +380,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 '₁';
@@ -148,51 +410,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;
-      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,223 +4,321 @@ 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 char	CHAR_NONE = '\0';
-
-  // Behavior flags
-  public static final int FLAG_KEEP_ON = 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);
-  public static final int FLAG_KEY_FONT = (1 << 5);
-
-  // 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);
-
-  // 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 FLAGS_ACCENTS = FLAG_ACCENT1 | FLAG_ACCENT2 |
-    FLAG_ACCENT3 | FLAG_ACCENT4 | FLAG_ACCENT5 | FLAG_ACCENT6 |
-    FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT;
-
-  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
   }
 
-  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);
+
+  // 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)
+  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;
-    return new KeyValue(name, name, CHAR_NONE, 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)
+  private static void addCharKey(String name, String symbol, char c, int flags)
   {
-    String name = String.valueOf(c);
-    addKey(name, name, c, event, 0);
+    addKey(name, symbol, KIND_CHAR, c, flags);
   }
 
-  private static void addModifierKey(String name, String symbol, int extra_flags)
+  private static void addModifierKey(String name, String symbol, Modifier m, int extra_flags)
   {
-    addKey(name, symbol, CHAR_NONE, EVENT_NONE,
-        FLAG_KEEP_ON | FLAG_NOCHAR | FLAG_NOREPEAT | extra_flags);
+    addKey(name, symbol, KIND_MODIFIER, m.ordinal(),
+        FLAG_LATCH | FLAG_SPECIAL | extra_flags);
   }
 
-  private static void addSpecialKey(String name, String symbol, int event)
+  private static void addEventKey(String name, String symbol, Event e, int flags)
   {
-    addKey(name, symbol, CHAR_NONE, event, FLAG_NOREPEAT);
+    addKey(name, symbol, KIND_EVENT, e.ordinal(), flags | FLAG_SPECIAL);
   }
 
-  private static void addEventKey(String name, String symbol, int event)
+  private static void addKeyeventKey(String name, String symbol, int code, int flags)
   {
-    addEventKey(name, symbol, event, 0);
+    addKey(name, symbol, KIND_KEYEVENT, code, flags);
   }
 
-  private static void addEventKey(String name, String symbol, int event, int flags)
+  // Within VALUE_BITS
+  private static int placeholder_unique_id = 0;
+
+  /** 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)
   {
-    addKey(name, symbol, CHAR_NONE, event, flags);
+    addKey(name, "", KIND_STRING, placeholder_unique_id++, 0);
   }
 
   static
   {
-    String chars = "<>&\"_°~{|^}$*:!£%µ?.§€";
-    for (int i = 0; i < chars.length(); i++)
-      addCharKey(chars.charAt(i), EVENT_NONE);
+    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);
 
-    addModifierKey("shift", "⇧", FLAG_LOCK | FLAG_SHIFT);
-    addModifierKey("ctrl", "Ctrl", FLAG_CTRL);
-    addModifierKey("alt", "Alt", FLAG_ALT);
-    addModifierKey("accent_grave", "◌̀", FLAG_ACCENT1);
-    addModifierKey("accent_aigu", "◌́", FLAG_ACCENT2);
-    addModifierKey("accent_circonflexe", "◌̂", FLAG_ACCENT3);
-    addModifierKey("accent_tilde", "◌̃", FLAG_ACCENT4);
-    addModifierKey("accent_cedille", "◌̧", FLAG_ACCENT5);
-    addModifierKey("accent_trema", "◌̈", FLAG_ACCENT6);
-    addModifierKey("superscript", "◌͆", FLAG_ACCENT_SUPERSCRIPT);
-    addModifierKey("subscript", "◌̺", FLAG_ACCENT_SUBSCRIPT);
-    addModifierKey("fn", "Fn", FLAG_FN);
+    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("change_method", "\u0009", Event.CHANGE_METHOD, FLAG_KEY_FONT | FLAG_SMALLER_FONT);
+    addEventKey("action", "Action", Event.ACTION, FLAG_SMALLER_FONT); // Will always be replaced
 
-    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);
+    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);
 
-    addSpecialKey("config", "Conf", EVENT_CONFIG);
-    addSpecialKey("switch_text", "ABC", EVENT_SWITCH_TEXT);
-    addSpecialKey("switch_numeric", "123+", EVENT_SWITCH_NUMERIC);
-    addSpecialKey("switch_emoji", ":)", EVENT_SWITCH_EMOJI);
-    addSpecialKey("switch_back_emoji", "ABC", EVENT_SWITCH_BACK_EMOJI);
-    addSpecialKey("change_method", "⊞", EVENT_CHANGE_METHOD);
+    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);
 
-    addEventKey("esc", "Esc", KeyEvent.KEYCODE_ESCAPE);
-    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", "⇞", KeyEvent.KEYCODE_PAGE_DOWN);
-    addEventKey("page_down", "⇟", KeyEvent.KEYCODE_PAGE_UP);
-    addEventKey("home", "↖", KeyEvent.KEYCODE_HOME);
-    addEventKey("end", "↗", KeyEvent.KEYCODE_MOVE_END);
-    addEventKey("backspace", "⌫", KeyEvent.KEYCODE_DEL, FLAG_PRECISE_REPEAT);
-    addEventKey("delete", "⌦", KeyEvent.KEYCODE_FORWARD_DEL, FLAG_PRECISE_REPEAT);
-    addEventKey("insert", "Ins", KeyEvent.KEYCODE_INSERT);
-    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);
+    addPlaceholderKey("removed");
+    addPlaceholderKey("f11_placeholder");
+    addPlaceholderKey("f12_placeholder");
+  }
 
-    addKey("tab",		"↹",		'\t',		KeyEvent.KEYCODE_TAB,			0);
-    addKey("space",	" ",		' ',		KeyEvent.KEYCODE_SPACE,			0);
+  // 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

@@ -1,73 +1,61 @@
 package juloo.keyboard2;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Typeface;
 import android.inputmethodservice.InputMethodService;
 import android.os.Build.VERSION;
-import android.os.Bundle;
 import android.os.IBinder;
-import android.text.InputType;
 import android.preference.PreferenceManager;
+import android.text.InputType;
+import android.view.ContextThemeWrapper;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.util.Log;
-import java.util.HashMap;
+import android.util.LogPrinter;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Keyboard2 extends InputMethodService
-	implements SharedPreferences.OnSharedPreferenceChangeListener
+  implements SharedPreferences.OnSharedPreferenceChangeListener
 {
-	private Keyboard2View	_keyboardView;
+  static private final String TAG = "Keyboard2";
+
+  private Keyboard2View _keyboardView;
   private int _currentTextLayout;
-	private ViewGroup		_emojiPane = null;
-	private Typeface		_specialKeyFont = null;
+  private ViewGroup _emojiPane = null;
 
-	private Config			_config;
+  private Config _config;
 
-  private Map<Integer, KeyboardData> _layoutCache = new HashMap<Integer, KeyboardData>();
+  private boolean _debug_logs = false;
 
   private KeyboardData getLayout(int resId)
   {
-    KeyboardData l = _layoutCache.get(resId);
-    if (l == null)
-    {
-      l = KeyboardData.parse(getResources().getXml(resId));
-      _layoutCache.put(resId, l);
-    }
-    return l;
+    return KeyboardData.load(getResources(), resId);
   }
 
-	@Override
-	public void				onCreate()
-	{
-		super.onCreate();
-		_specialKeyFont = Typeface.createFromAsset(getAssets(), "fonts/keys.ttf");
-		PreferenceManager.setDefaultValues(this, R.xml.settings, false);
-		PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
-		_config = new Config(this);
-		_keyboardView = (Keyboard2View)getLayoutInflater().inflate(R.layout.keyboard, null);
-		_keyboardView.reset();
-	}
-
-	public Config			getConfig()
-	{
-		return (_config);
-	}
-
-	public Typeface			getSpecialKeyFont()
-	{
-		return (_specialKeyFont);
-	}
+  @Override
+  public void onCreate()
+  {
+    super.onCreate();
+    PreferenceManager.setDefaultValues(this, R.xml.settings, false);
+    PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
+    Config.initGlobalConfig(this, new KeyEventHandler(this.new Receiver()));
+    _config = Config.globalConfig();
+    _config.refresh(this);
+    _keyboardView = (Keyboard2View)inflate_view(R.layout.keyboard);
+    _keyboardView.reset();
+    _debug_logs = getResources().getBoolean(R.bool.debug_logs);
+  }
 
   private List<InputMethodSubtype> getEnabledSubtypes(InputMethodManager imm)
   {
@@ -75,48 +63,54 @@ 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)
   {
-    int l = _config.layout;;
+    int l = _config.layout;
     if (l == -1)
     {
       String s = subtype.getExtraValueOf("default_layout");
       if (s != null)
         l = Config.layoutId_of_string(s);
+      else
+        l = R.xml.qwerty;
     }
     _currentTextLayout = l;
   }
 
-  private int accents_of_subtype(InputMethodSubtype subtype)
+  private void extra_keys_of_subtype(Set<KeyValue> dst, InputMethodSubtype subtype)
   {
-    String accents_option = subtype.getExtraValueOf("accents");
-    int flags = 0;
-    if (accents_option != null)
-      for (String acc : accents_option.split("\\|"))
-        flags |= Config.accentFlag_of_name(acc);
-    return flags;
+    String extra_keys = subtype.getExtraValueOf("extra_keys");
+    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)
   {
-    final int DONT_REMOVE = KeyValue.FLAG_ACCENT_SUPERSCRIPT | KeyValue.FLAG_ACCENT_SUBSCRIPT;
-    int to_keep = DONT_REMOVE;
+    HashSet<KeyValue> extra_keys = new HashSet<KeyValue>();
+    List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm);
     switch (_config.accents)
     {
-      case 1:
-        to_keep |= accents_of_subtype(subtype);
-        for (InputMethodSubtype s : getEnabledSubtypes(imm))
-          to_keep |= accents_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 |= accents_of_subtype(subtype); break;
-      case 3: to_keep = KeyValue.FLAGS_ACCENTS; break;
       case 4: break;
       default: throw new IllegalArgumentException();
     }
-    _config.accent_flags_to_remove = ~to_keep & KeyValue.FLAGS_ACCENTS;
+    _config.extra_keys = extra_keys;
+    if (enabled_subtypes.size() > 1)
+      _config.shouldOfferSwitchingToNextInputMethod = true;
   }
 
   private void refreshSubtypeLegacyFallback()
@@ -124,8 +118,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.accent_flags_to_remove = 0; break;
-      case 4: _config.accent_flags_to_remove = KeyValue.FLAGS_ACCENTS; break;
+      case 1: case 2: case 3: _config.extra_keys = null; break;
+      case 4: _config.extra_keys = 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;
@@ -146,28 +140,94 @@ public class Keyboard2 extends InputMethodService
       refreshSubtypeLayout(subtype);
       refreshAccentsOption(imm, subtype);
     }
+    _config.shouldOfferSwitchingToProgramming =
+      _config.programming_layout != -1 &&
+      _currentTextLayout != _config.programming_layout;
   }
 
-	@Override
-	public View				onCreateInputView()
-	{
-		ViewGroup		parent = (ViewGroup)_keyboardView.getParent();
+  private String actionLabel_of_imeAction(int action)
+  {
+    int res;
+    switch (action)
+    {
+      case EditorInfo.IME_ACTION_NEXT: res = R.string.key_action_next; break;
+      case EditorInfo.IME_ACTION_DONE: res = R.string.key_action_done; break;
+      case EditorInfo.IME_ACTION_GO: res = R.string.key_action_go; break;
+      case EditorInfo.IME_ACTION_PREVIOUS: res = R.string.key_action_prev; break;
+      case EditorInfo.IME_ACTION_SEARCH: res = R.string.key_action_search; break;
+      case EditorInfo.IME_ACTION_SEND: res = R.string.key_action_send; break;
+      case EditorInfo.IME_ACTION_UNSPECIFIED:
+      case EditorInfo.IME_ACTION_NONE:
+      default: return null;
+    }
+    return getResources().getString(res);
+  }
 
-		if (parent != null)
-			parent.removeView(_keyboardView);
-		return (_keyboardView);
-	}
+  private void refreshEditorInfo(EditorInfo info)
+  {
+    // First try to look at 'info.actionLabel', if it isn't set, look at
+    // 'imeOptions'.
+    if (info.actionLabel != null)
+    {
+      _config.actionLabel = info.actionLabel.toString();
+      _config.actionId = info.actionId;
+      _config.swapEnterActionKey = false;
+    }
+    else
+    {
+      int action = info.imeOptions & EditorInfo.IME_MASK_ACTION;
+      _config.actionLabel = actionLabel_of_imeAction(action); // Might be null
+      _config.actionId = action;
+      _config.swapEnterActionKey =
+        (info.imeOptions & EditorInfo.IME_FLAG_NO_ENTER_ACTION) == 0;
+    }
+  }
 
-	@Override
-	public void				onStartInputView(EditorInfo info, boolean restarting)
-	{
+  private void refreshConfig()
+  {
+    int prev_theme = _config.theme;
+    _config.refresh(this);
     refreshSubtypeImm();
-		if ((info.inputType & InputType.TYPE_CLASS_NUMBER) != 0)
+    // Refreshing the theme config requires re-creating the views
+    if (prev_theme != _config.theme)
+    {
+      _keyboardView = (Keyboard2View)inflate_view(R.layout.keyboard);
+      _emojiPane = null;
+    }
+  }
+
+  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);
+    if ((info.inputType & InputType.TYPE_CLASS_NUMBER) != 0)
       _keyboardView.setKeyboard(getLayout(R.xml.numeric));
     else
       _keyboardView.setKeyboard(getLayout(_currentTextLayout));
-    _keyboardView.reset(); // Layout might need to change due to rotation
-	}
+    setInputView(_keyboardView);
+    if (_debug_logs)
+      log_editor_info(info);
+  }
+
+  @Override
+  public void setInputView(View v)
+  {
+    ViewParent parent = v.getParent();
+    if (parent != null && parent instanceof ViewGroup)
+      ((ViewGroup)parent).removeView(v);
+    super.setInputView(v);
+  }
 
   @Override
   public void onCurrentInputMethodSubtypeChanged(InputMethodSubtype subtype)
@@ -183,95 +243,103 @@ public class Keyboard2 extends InputMethodService
     _keyboardView.reset();
   }
 
-	@Override
-	public void				onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
-	{
-		_config.refresh();
-    refreshSubtypeImm();
-		_keyboardView.refreshConfig(_config, getLayout(_currentTextLayout));
-	}
+  @Override
+  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
+  {
+    refreshConfig();
+  }
 
-	@Override
-	public void				onConfigurationChanged(Configuration newConfig)
-	{
-		_keyboardView.reset();
-	}
+  /** Not static */
+  public class Receiver implements KeyEventHandler.IReceiver
+  {
+    public void switchToNextInputMethod()
+    {
+      InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
+      imm.showInputMethodPicker();
+      // deprecated in version 28: imm.switchToNextInputMethod(getConnectionToken(), false);
+      // added in version 28: switchToNextInputMethod(false);
+    }
 
-	public void				handleKeyUp(KeyValue key, int flags)
-	{
-		if (getCurrentInputConnection() == null)
-			return ;
-    key = KeyModifier.handleFlags(key, flags);
-		if (key.eventCode == KeyValue.EVENT_CONFIG)
-		{
-			Intent intent = new Intent(this, SettingsActivity.class);
-			intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			startActivity(intent);
-		}
-		else if (key.eventCode == KeyValue.EVENT_SWITCH_TEXT)
-			_keyboardView.setKeyboard(getLayout(_currentTextLayout));
-		else if (key.eventCode == KeyValue.EVENT_SWITCH_NUMERIC)
-			_keyboardView.setKeyboard(getLayout(R.xml.numeric));
-		else if (key.eventCode == KeyValue.EVENT_SWITCH_EMOJI)
-		{
-			if (_emojiPane == null)
-				_emojiPane = (ViewGroup)getLayoutInflater().inflate(R.layout.emoji_pane, null);
-			setInputView(_emojiPane);
-		}
-		else if (key.eventCode == KeyValue.EVENT_SWITCH_BACK_EMOJI)
-			setInputView(_keyboardView);
-		else if (key.eventCode == KeyValue.EVENT_CHANGE_METHOD)
-		{
-			InputMethodManager	imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
-			imm.switchToNextInputMethod(getConnectionToken(), false);
-		}
-		else if ((flags & (KeyValue.FLAG_CTRL | KeyValue.FLAG_ALT)) != 0)
-			handleMetaKeyUp(key, flags);
-		// else if (eventCode == KeyEvent.KEYCODE_DEL)
-		// 	handleDelKey(1, 0);
-		// else if (eventCode == KeyEvent.KEYCODE_FORWARD_DEL)
-		// 	handleDelKey(0, 1);
-		else if (key.char_ == KeyValue.CHAR_NONE)
-		{
-			if (key.eventCode != KeyValue.EVENT_NONE)
-				handleMetaKeyUp(key, flags);
-			else
-				getCurrentInputConnection().commitText(key.symbol, 1);
-		}
-		else
-			sendKeyChar(key.char_);
-	}
+    public void setPane_emoji()
+    {
+      if (_emojiPane == null)
+        _emojiPane = (ViewGroup)inflate_view(R.layout.emoji_pane);
+      setInputView(_emojiPane);
+    }
 
-	// private void			handleDelKey(int before, int after)
-	// {
-	// 	CharSequence	selection = getCurrentInputConnection().getSelectedText(0);
+    public void setPane_normal()
+    {
+      setInputView(_keyboardView);
+    }
 
-	// 	if (selection != null && selection.length() > 0)
-	// 		getCurrentInputConnection().commitText("", 1);
-	// 	else
-	// 		getCurrentInputConnection().deleteSurroundingText(before, after);
-	// }
+    public void performAction()
+    {
+      InputConnection conn = getCurrentInputConnection();
+      if (conn == null)
+        return;
+      conn.performEditorAction(_config.actionId);
+    }
 
-	private void			handleMetaKeyUp(KeyValue key, int flags)
-	{
-		int			metaState = 0;
-		KeyEvent	event;
+    public void switchMain()
+    {
+      _keyboardView.setKeyboard(getLayout(_currentTextLayout));
+    }
 
-		if (key.eventCode == KeyValue.EVENT_NONE)
-			return ;
-		if ((flags & KeyValue.FLAG_CTRL) != 0)
-			metaState |= KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_ON;
-		if ((flags & KeyValue.FLAG_ALT) != 0)
-			metaState |= KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_ON;
-		if ((flags & KeyValue.FLAG_SHIFT) != 0)
-			metaState |= KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_SHIFT_ON;
-		event = new KeyEvent(1, 1, KeyEvent.ACTION_DOWN, key.eventCode, 1, metaState);
-		getCurrentInputConnection().sendKeyEvent(event);
-		getCurrentInputConnection().sendKeyEvent(KeyEvent.changeAction(event, KeyEvent.ACTION_UP));
-	}
+    public void switchNumeric()
+    {
+      _keyboardView.setKeyboard(getLayout(R.xml.numeric));
+    }
+
+    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)
+    {
+      InputConnection conn = getCurrentInputConnection();
+      if (conn == null)
+        return;
+      conn.sendKeyEvent(new KeyEvent(1, 1, eventAction, eventCode, 0, meta));
+    }
+
+    public void showKeyboardConfig()
+    {
+      Intent intent = new Intent(Keyboard2.this, SettingsActivity.class);
+      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+      startActivity(intent);
+    }
+
+    public void commitText(String text)
+    {
+      getCurrentInputConnection().commitText(text, 1);
+    }
+
+    public void commitChar(char c)
+    {
+      sendKeyChar(c);
+    }
+  }
 
   private IBinder getConnectionToken()
   {
     return getWindow().getWindow().getAttributes().token;
   }
+
+  private View inflate_view(int layout)
+  {
+    return View.inflate(new ContextThemeWrapper(this, _config.theme), layout, null);
+  }
 }

srcs/juloo.keyboard2/Keyboard2View.java

@@ -1,482 +1,313 @@
 package juloo.keyboard2;
 
 import android.content.Context;
-import android.content.res.Resources;
+import android.content.ContextWrapper;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.graphics.Typeface;
-import android.os.Handler;
-import android.os.Message;
-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.widget.PopupWindow;
-import java.util.ArrayList;
+import android.view.Window;
 
 public class Keyboard2View extends View
-	implements View.OnTouchListener, Handler.Callback
+  implements View.OnTouchListener, Pointers.IPointerEventHandler
 {
-	private static final long		VIBRATE_MIN_INTERVAL = 100;
+  private KeyboardData _keyboard;
 
-	private KeyboardData		_keyboard;
+  private Pointers _pointers;
 
-	private ArrayList<KeyDown>	_downKeys = new ArrayList<KeyDown>();
+  private Pointers.Modifiers _mods;
 
-	private int					_flags = 0;
+  private static int _currentWhat = 0;
 
-	private Vibrator			_vibratorService;
-	private long				_lastVibration = 0;
+  private Config _config;
 
-	private Handler				_handler;
-	private static int			_currentWhat = 0;
+  private float _keyWidth;
 
-	private Config				_config;
+  private Theme _theme;
 
-	private float				_keyWidth;
+  private static RectF _tmpRect = new RectF();
 
-	private Paint _keyBgPaint = new Paint();
-	private Paint _keyDownBgPaint = new Paint();
-	private Paint _keyLabelPaint;
-	private Paint _keySubLabelPaint;
-	private Paint _specialKeyLabelPaint;
-	private Paint _specialKeySubLabelPaint;
-  private int _lockedColor;
-  private int _activatedColor;
-  private int _labelColor;
-  private int _subLabelColor;
-  private float _labelTextSize;
-  private float _sublabelTextSize;
-
-	private static RectF		_tmpRect = new RectF();
-
-	public Keyboard2View(Context context, AttributeSet attrs)
-	{
-		super(context, attrs);
-		_vibratorService = (Vibrator)context.getSystemService(Context.VIBRATOR_SERVICE);
-		_handler = new Handler(this);
-    refreshConfig(((Keyboard2)context).getConfig(), null);
-		setOnTouchListener(this);
-	}
-
-  /* Internally calls [reset()]. */
-  public void refreshConfig(Config config, KeyboardData kw)
+  enum Vertical
   {
-    Resources res = getResources();
-		_config = config;
-    _lockedColor = res.getColor(R.color.key_label_locked);
-    _activatedColor = res.getColor(R.color.key_label_activated);
-    _labelColor = res.getColor(R.color.key_label);
-    _subLabelColor = res.getColor(R.color.key_sub_label);
-    _labelTextSize = res.getDimension(R.dimen.label_text_size) * config.characterSize;
-    _sublabelTextSize = res.getDimension(R.dimen.sublabel_text_size) * config.characterSize;
-		_keyBgPaint.setColor(res.getColor(R.color.key_bg));
-		_keyDownBgPaint.setColor(res.getColor(R.color.key_down_bg));
-		_keyLabelPaint = initLabelPaint(Paint.Align.CENTER, null);
-		_keySubLabelPaint = initLabelPaint(Paint.Align.LEFT, null);
-		Typeface	specialKeysFont = ((Keyboard2)getContext()).getSpecialKeyFont();
-		_specialKeyLabelPaint = initLabelPaint(Paint.Align.CENTER, specialKeysFont);
-		_specialKeySubLabelPaint = initLabelPaint(Paint.Align.LEFT, specialKeysFont);
-    if (kw != null)
-      setKeyboard(kw); // handle layout options then calls reset().
+    TOP,
+    CENTER,
+    BOTTOM
   }
 
-	private Paint		initLabelPaint(Paint.Align align, Typeface font)
-	{
-    Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    paint.setTextAlign(align);
-    if (font != null)
-      paint.setTypeface(font);
-		return (paint);
-	}
-
-  public void			setKeyboard(KeyboardData kw)
+  public Keyboard2View(Context context, AttributeSet attrs)
   {
-    if (!_config.shouldOfferSwitchingToNextInputMethod)
-      kw = kw.removeKeys(new KeyboardData.RemoveKeysByEvent(KeyValue.EVENT_CHANGE_METHOD));
-    if (_config.accent_flags_to_remove != 0)
-      kw = kw.removeKeys(new KeyboardData.RemoveKeysByFlags(_config.accent_flags_to_remove));
-    _keyboard = kw;
+    super(context, attrs);
+    _theme = new Theme(getContext(), attrs);
+    _config = Config.globalConfig();
+    _pointers = new Pointers(this, _config);
+    refresh_navigation_bar(context);
+    setOnTouchListener(this);
     reset();
   }
 
-	public void			reset()
-	{
-		_flags = 0;
-		_downKeys.clear();
-		requestLayout();
-		invalidate();
-	}
-
-	@Override
-	public boolean		onTouch(View v, MotionEvent event)
-	{
-		float				x;
-		float				y;
-		float				keyW;
-		int					p;
-
-		switch (event.getActionMasked())
-		{
-		case MotionEvent.ACTION_UP:
-		case MotionEvent.ACTION_POINTER_UP:
-			onTouchUp(event.getPointerId(event.getActionIndex()));
-			break ;
-		case MotionEvent.ACTION_DOWN:
-		case MotionEvent.ACTION_POINTER_DOWN:
-			p = event.getActionIndex();
-			onTouchDown(event.getX(p), event.getY(p), event.getPointerId(p));
-			break ;
-		case MotionEvent.ACTION_MOVE:
-			for (p = 0; p < event.getPointerCount(); p++)
-				onTouchMove(event.getX(p), event.getY(p), event.getPointerId(p));
-			break ;
-		default:
-			return (false);
-		}
-		return (true);
-	}
-
-	private KeyDown		getKeyDown(int pointerId)
-	{
-		for (KeyDown k : _downKeys)
-		{
-			if (k.pointerId == pointerId)
-				return (k);
-		}
-		return (null);
-	}
-
-	private KeyDown		getKeyDown(KeyboardData.Key key)
-	{
-		for (KeyDown k : _downKeys)
-		{
-			if (k.key == key)
-				return (k);
-		}
-		return (null);
-	}
-
-	private KeyDown		getKeyDown(KeyValue kv)
-	{
-		for (KeyDown k : _downKeys)
-		{
-			if (k.value == kv)
-				return (k);
-		}
-		return (null);
-	}
-
-	private void		onTouchMove(float moveX, float moveY, int pointerId)
-	{
-		KeyDown				key = getKeyDown(pointerId);
-		KeyValue			newValue;
-
-		if (key != null)
-		{
-			moveX -= key.downX;
-			moveY -= key.downY;
-      float absDist = Math.abs(moveX) + Math.abs(moveY);
-      key.ptrDist = absDist;
-			if (absDist < _config.subValueDist)
-				newValue = key.key.key0;
-			else if (moveX < 0)
-				newValue = (moveY < 0) ? key.key.key1 : key.key.key3;
-			else if (moveY < 0)
-				newValue = key.key.key2;
-			else
-				newValue = key.key.key4;
-			if (newValue != null && newValue != key.value)
-			{
-				if (key.timeoutWhat != -1)
-				{
-					_handler.removeMessages(key.timeoutWhat);
-					if ((newValue.flags & KeyValue.FLAG_NOREPEAT) == 0)
-						_handler.sendEmptyMessageDelayed(key.timeoutWhat, _config.longPressTimeout);
-				}
-				key.value = newValue;
-				key.flags = newValue.flags;
-				updateFlags();
-				invalidate();
-				handleKeyDown(newValue);
-			}
-		}
-	}
-
-	private void		onTouchDown(float touchX, float touchY, int pointerId)
-	{
-		float y = _config.marginTop - _config.keyHeight;
-		for (KeyboardData.Row row : _keyboard.rows)
-		{
-			y += _config.keyHeight;
-			if (touchY < y || touchY >= (y + _config.keyHeight))
-				continue ;
-      float x = _config.horizontalMargin;
-			for (KeyboardData.Key key : row.keys)
-			{
-        x += key.shift * _keyWidth;
-				float keyW = _keyWidth * key.width;
-				if (touchX >= x && touchX < (x + keyW))
-				{
-          int what = _currentWhat++;
-          if (key.key0 != null && (key.key0.flags & KeyValue.FLAG_NOREPEAT) == 0)
-            _handler.sendEmptyMessageDelayed(what, _config.longPressTimeout);
-          _downKeys.add(new KeyDown(pointerId, key, touchX, touchY, what));
-					handleKeyDown(key.key0);
-					updateFlags();
-					invalidate();
-					return ;
-				}
-				x += keyW;
-			}
-		}
-	}
-
-  // Whether a key is already activated (key down but pointer up)
-  private KeyDown getActivatedKey(KeyValue kv)
+  private Window getParentWindow(Context context)
   {
-		for (KeyDown k : _downKeys)
-		{
-			if (k.value == kv && k.pointerId == -1)
-				return (k);
-		}
-		return (null);
+    if (context instanceof InputMethodService)
+      return ((InputMethodService)context).getWindow().getWindow();
+    if (context instanceof ContextWrapper)
+      return getParentWindow(((ContextWrapper)context).getBaseContext());
+    return null;
   }
 
-	private void		onTouchUp(int pointerId)
-	{
-		KeyDown				k = getKeyDown(pointerId);
+  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);
+  }
 
-		if (k != null)
-		{
-      // Stop key repeat
-      if (k.timeoutWhat != -1)
+  public void setKeyboard(KeyboardData kw)
+  {
+    _keyboard = _config.modify_layout(kw);
+    reset();
+  }
+
+  public void reset()
+  {
+    _mods = Pointers.Modifiers.EMPTY;
+    _pointers.clear();
+    requestLayout();
+    invalidate();
+  }
+
+  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()
+  {
+    invalidate();
+  }
+
+  private void updateFlags()
+  {
+    _mods = _pointers.getModifiers();
+  }
+
+  @Override
+  public boolean onTouch(View v, MotionEvent event)
+  {
+    int p;
+    switch (event.getActionMasked())
+    {
+      case MotionEvent.ACTION_UP:
+      case MotionEvent.ACTION_POINTER_UP:
+        _pointers.onTouchUp(event.getPointerId(event.getActionIndex()));
+        break;
+      case MotionEvent.ACTION_DOWN:
+      case MotionEvent.ACTION_POINTER_DOWN:
+        p = event.getActionIndex();
+        float tx = event.getX(p);
+        float ty = event.getY(p);
+        KeyboardData.Key key = getKeyAtPosition(tx, ty);
+        if (key != null)
+          _pointers.onTouchDown(tx, ty, event.getPointerId(p), key);
+        break;
+      case MotionEvent.ACTION_MOVE:
+        for (p = 0; p < event.getPointerCount(); p++)
+          _pointers.onTouchMove(event.getX(p), event.getY(p), event.getPointerId(p));
+        break;
+      case MotionEvent.ACTION_CANCEL:
+        _pointers.onTouchCancel(event.getPointerId(event.getActionIndex()));
+        break;
+      default:
+        return (false);
+    }
+    return (true);
+  }
+
+  private KeyboardData.Row getRowAtPosition(float ty)
+  {
+    float y = _config.marginTop;
+    if (ty < y)
+      return null;
+    for (KeyboardData.Row row : _keyboard.rows)
+    {
+      y += (row.shift + row.height) * _config.keyHeight;
+      if (ty < y)
+        return row;
+    }
+    return null;
+  }
+
+  private KeyboardData.Key getKeyAtPosition(float tx, float ty)
+  {
+    KeyboardData.Row row = getRowAtPosition(ty);
+    float x = _config.horizontalMargin;
+    if (row == null || tx < x)
+      return null;
+    for (KeyboardData.Key key : row.keys)
+    {
+      x += (key.shift + key.width) * _keyWidth;
+      if (tx < x)
+        return key;
+    }
+    return null;
+  }
+
+  private void vibrate()
+  {
+    if (!_config.vibrateEnabled)
+      return ;
+    if (VERSION.SDK_INT >= 5)
+    {
+      performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,
+          HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
+    }
+  }
+
+  @Override
+  public void onMeasure(int wSpec, int hSpec)
+  {
+    DisplayMetrics dm = getContext().getResources().getDisplayMetrics();
+    int width = dm.widthPixels;
+    int height =
+      (int)(_config.keyHeight * _keyboard.keysHeight
+          + _keyboard.rows.size()
+          + _config.marginTop + _config.marginBottom);
+    setMeasuredDimension(width, height);
+    _keyWidth = (width - (_config.horizontalMargin * 2)) / _keyboard.keysWidth;
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas)
+  {
+    updateFlags();
+    float y = _config.marginTop + _config.keyVerticalInterval / 2;
+    for (KeyboardData.Row row : _keyboard.rows)
+    {
+      y += row.shift * _config.keyHeight;
+      float x = _config.horizontalMargin + _config.keyHorizontalInterval / 2;
+      float keyH = row.height * _config.keyHeight - _config.keyVerticalInterval;
+      for (KeyboardData.Key k : row.keys)
       {
-        _handler.removeMessages(k.timeoutWhat);
-        k.timeoutWhat = -1;
-      }
-      KeyDown k_on = getActivatedKey(k.value);
-      if (k_on != null)
-      {
-        _downKeys.remove(k); // Remove dupplicate
-        // Same key with FLAG_LOCK is already on, do lock
-        if ((k_on.flags & KeyValue.FLAG_LOCK) != 0)
+        x += k.shift * _keyWidth;
+        float keyW = _keyWidth * k.width - _config.keyHorizontalInterval;
+        boolean isKeyDown = _pointers.isKeyDown(k);
+        _tmpRect.set(x, y, x + keyW, y + keyH);
+        canvas.drawRoundRect(_tmpRect, _theme.keyBorderRadius, _theme.keyBorderRadius,
+            isKeyDown ? _theme.keyDownBgPaint : _theme.keyBgPaint);
+        drawLabel(canvas, k.key0, keyW / 2f + x, y, keyH, isKeyDown);
+        if (k.edgekeys)
         {
-          k_on.flags ^= KeyValue.FLAG_LOCK; // Next time, disable it
-          k_on.flags |= KeyValue.FLAG_LOCKED;
+          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);
         }
-        // Otherwise, toggle it
         else
         {
-          _downKeys.remove(k_on);
+          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;
       }
-      // Key stay activated
-      else if ((k.flags & KeyValue.FLAG_KEEP_ON) != 0)
-      {
-        k.pointerId = -1; // Set pointer up
-      }
-      else // Regular key up
-      {
-        for (int i = 0; i < _downKeys.size(); i++)
-        {
-          KeyDown downKey = _downKeys.get(i);
-          // Disable other activated keys that aren't locked
-          if (downKey.pointerId == -1 && (downKey.flags & KeyValue.FLAG_LOCKED) == 0)
-            _downKeys.remove(i--);
-          // Other keys currently down won't stay activated
-          else if ((downKey.flags & KeyValue.FLAG_KEEP_ON) != 0)
-            downKey.flags ^= KeyValue.FLAG_KEEP_ON;
-        }
-        _downKeys.remove(k);
-        handleKeyUp(k);
-      }
-      updateFlags();
-      invalidate();
-		}
-	}
+      y += row.height * _config.keyHeight;
+    }
+  }
 
-	private void		handleKeyUp(KeyDown key)
-	{
-		if (key.value != null && (key.flags & (KeyValue.FLAG_LOCKED | KeyValue.FLAG_NOCHAR)) == 0)
-			((Keyboard2)getContext()).handleKeyUp(key.value, _flags);
-	}
-
-	private void		handleKeyDown(KeyValue key)
-	{
-		if (key == null)
-			return ;
-		vibrate();
-	}
-
-	private void		updateFlags()
-	{
-		_flags = 0;
-		for (KeyDown k : _downKeys)
-			_flags |= k.flags;
-	}
-
-	private void		vibrate()
-	{
-		if (!_config.vibrateEnabled)
-			return ;
-		long now = System.currentTimeMillis();
-		if ((now - _lastVibration) > VIBRATE_MIN_INTERVAL)
-		{
-			_lastVibration = now;
-			try
-			{
-				_vibratorService.vibrate(_config.vibrateDuration);
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	}
-
-	@Override
-	public boolean		handleMessage(Message msg)
-	{
-		for (KeyDown key : _downKeys)
-		{
-			if (key.timeoutWhat == msg.what)
-			{
-        long nextInterval = _config.longPressInterval;
-        if (_config.preciseRepeat && (key.flags & KeyValue.FLAG_PRECISE_REPEAT) != 0)
-        {
-          // Modulate repeat interval depending on the distance of the pointer
-          float accel = Math.min(4.f, Math.max(0.3f, key.ptrDist / (_config.subValueDist * 15.f)));
-          nextInterval = (long)((float)nextInterval / accel);
-        }
-				_handler.sendEmptyMessageDelayed(msg.what, nextInterval);
-				((Keyboard2)getContext()).handleKeyUp(key.value, _flags);
-				return (true);
-			}
-		}
-		return (false);
-	}
-
-	@Override
-	public void			onMeasure(int wSpec, int hSpec)
-	{
-    DisplayMetrics dm = getContext().getResources().getDisplayMetrics();
-    int height;
-    height = (int)(_config.keyHeight * _keyboard.keysHeight
-        + _keyboard.rows.size() * _config.keyVerticalInterval
-        + _config.marginTop + _config.marginBottom);
-    setMeasuredDimension(dm.widthPixels, height);
-    _keyWidth = (getWidth() - (_config.horizontalMargin * 2)) / _keyboard.keysWidth;
-	}
-
-	@Override
-	protected void		onDraw(Canvas canvas)
-	{
-		float y = _config.marginTop;
-		for (KeyboardData.Row row : _keyboard.rows)
-		{
-      y += row.shift * _config.keyHeight;
-      float x = _config.horizontalMargin;
-      float keyH = row.height * _config.keyHeight;
-			for (KeyboardData.Key k : row.keys)
-			{
-        x += k.shift * _keyWidth + _config.keyHorizontalInterval;
-				float keyW = _keyWidth * k.width - _config.keyHorizontalInterval;
-				KeyDown keyDown = getKeyDown(k);
-				_tmpRect.set(x, y, x + keyW, y + keyH);
-				if (keyDown != null)
-					canvas.drawRect(_tmpRect, _keyDownBgPaint);
-				else
-					canvas.drawRoundRect(_tmpRect, _config.keyRound, _config.keyRound, _keyBgPaint);
-				if (k.key0 != null)
-					drawLabel(canvas, k.key0, keyW / 2f + x, (keyH + _labelTextSize) / 2f + y, keyDown);
-				float subPadding = _config.keyPadding;
-				if (k.key1 != null)
-					drawSubLabel(canvas, k.key1, x + subPadding, y + subPadding, false, true, keyDown);
-				if (k.key3 != null)
-					drawSubLabel(canvas, k.key3, x + subPadding, y + keyH - subPadding, false, false, keyDown);
-				if (k.key2 != null)
-					drawSubLabel(canvas, k.key2, x + keyW - subPadding, y + subPadding, true, true, keyDown);
-				if (k.key4 != null)
-					drawSubLabel(canvas, k.key4, x + keyW - subPadding, y + keyH - subPadding, true, false, keyDown);
-				x += keyW;
-			}
-			y += keyH + _config.keyVerticalInterval;
-		}
-	}
-
-	@Override
-	public void			onDetachedFromWindow()
-	{
-		super.onDetachedFromWindow();
-	}
-
-  private int labelColor(KeyValue k, KeyDown hasKeyDown, int defaultColor)
+  @Override
+  public void onDetachedFromWindow()
   {
-    if (hasKeyDown != null)
+    super.onDetachedFromWindow();
+  }
+
+  private int labelColor(KeyValue k, boolean isKeyDown, int defaultColor)
+  {
+    if (isKeyDown && k.hasFlags(KeyValue.FLAG_LATCH))
     {
-      KeyDown kd = getKeyDown(k);
-      if (kd != null)
+      int flags = _pointers.getKeyFlags(k);
+      if (flags != -1)
       {
-        if ((kd.flags & KeyValue.FLAG_LOCKED) != 0)
-          return _lockedColor;
-        if (kd.pointerId == -1)
-          return _activatedColor;
+        if ((flags & KeyValue.FLAG_LOCKED) != 0)
+          return _theme.lockedColor;
+        if ((flags & KeyValue.FLAG_LATCH) == 0)
+          return _theme.activatedColor;
       }
     }
     return defaultColor;
   }
 
-	private void		drawLabel(Canvas canvas, KeyValue k, float x, float y, KeyDown keyDown)
-	{
-    k = KeyModifier.handleFlags(k, _flags);
-    Paint p = ((k.flags & KeyValue.FLAG_KEY_FONT) != 0) ? _specialKeyLabelPaint : _keyLabelPaint;
-    p.setColor(labelColor(k, keyDown, _labelColor));
-    p.setTextSize(_labelTextSize * scaleTextSize(k));
-    canvas.drawText(k.symbol, x, y, p);
-	}
-
-	private void		drawSubLabel(Canvas canvas, KeyValue k, float x, float y, boolean right, boolean up, KeyDown keyDown)
-	{
-    k = KeyModifier.handleFlags(k, _flags);
-    Paint p = ((k.flags & KeyValue.FLAG_KEY_FONT) != 0) ? _specialKeySubLabelPaint : _keySubLabelPaint;
-    p.setColor(labelColor(k, keyDown, _subLabelColor));
-    p.setTextAlign(right ? Paint.Align.RIGHT : Paint.Align.LEFT);
-    p.setTextSize(_sublabelTextSize * scaleTextSize(k));
-    y -= up ? p.ascent() : p.descent();
-    canvas.drawText(k.symbol, x, y, p);
-	}
-
-  private float scaleTextSize(KeyValue k)
+  private void drawLabel(Canvas canvas, KeyboardData.Corner k, float x, float y, float keyH, boolean isKeyDown)
   {
-    return (k.symbol.length() < 2) ? 1.f : 0.8f;
+    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(kv.getString(), x, (keyH - p.ascent() - p.descent()) / 2f + y, p);
   }
 
-	private static class KeyDown
-	{
-    /* -1 if pointer is up. */
-		public int				pointerId;
-		public KeyValue			value;
-		public KeyboardData.Key	key;
-		public float			downX;
-		public float			downY;
-    /* Manhattan distance of the pointer to the center of the key */
-    public float ptrDist;
-		public int				flags;
-		public int				timeoutWhat;
+  private void drawSubLabel(Canvas canvas, KeyboardData.Corner k, float x, float y, float keyW, float keyH, Paint.Align a, Vertical v, boolean isKeyDown)
+  {
+    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)
+      y += (keyH - p.ascent() - p.descent()) / 2f;
+    else
+      y += (v == Vertical.TOP) ? subPadding - p.ascent() : keyH - subPadding - p.descent();
+    if (a == Paint.Align.CENTER)
+      x += keyW / 2f;
+    else
+      x += (a == Paint.Align.LEFT) ? subPadding : keyW - subPadding;
+    canvas.drawText(kv.getString(), x, y, p);
+  }
 
-		public KeyDown(int pointerId, KeyboardData.Key key, float x, float y, int what)
-		{
-			this.pointerId = pointerId;
-			value = key.key0;
-			this.key = key;
-			downX = x;
-			downY = y;
-      ptrDist = 0.f;
-			flags = (value == null) ? 0 : value.flags;
-			timeoutWhat = what;
-		}
-	}
+  private float scaleTextSize(KeyValue k, float rel_size, float keyH)
+  {
+    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

@@ -1,81 +1,137 @@
 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. */
+  public final List<Row> rows;
+  /** 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(List<Row> rows_)
+  public KeyboardData mapKeys(MapKey f)
+  {
+    ArrayList<Row> rows_ = new ArrayList<Row>();
+    for (Row r : rows)
+      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);
+    return new KeyboardData(rows, keysWidth, extra_keys);
+  }
+
+  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;
+  private static Map<Integer, KeyboardData> _layoutCache = new HashMap<Integer, KeyboardData>();
+
+  public static KeyboardData load(Resources res, int id)
+  {
+    KeyboardData l = _layoutCache.get(id);
+    if (l == null)
+    {
+      try
+      {
+        if (_bottomRow == null)
+          _bottomRow = parse_bottom_row(res.getXml(R.xml.bottom_row));
+        l = parse_keyboard(res.getXml(id));
+        _layoutCache.put(id, l);
+      }
+      catch (Exception e)
+      {
+        e.printStackTrace();
+      }
+    }
+    return l;
+  }
+
+  private static KeyboardData parse_keyboard(XmlResourceParser parser) throws Exception
+  {
+    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, extra_keys);
+  }
+
+  private static float compute_max_width(List<Row> rows)
+  {
+    float w = 0.f;
+    for (Row r : rows)
+      w = Math.max(w, r.keysWidth);
+    return w;
+  }
+
+  private static Row parse_bottom_row(XmlResourceParser parser) throws Exception
+  {
+    if (!expect_tag(parser, "row"))
+      throw new Exception("Failed to parse bottom row");
+    return Row.parse(parser);
+  }
+
+  protected KeyboardData(List<Row> rows_, float kw, boolean xk)
   {
-    float kw = 0.f;
     float kh = 0.f;
     for (Row r : rows_)
-    {
-      kw = Math.max(kw, r.keysWidth);
       kh += r.height + r.shift;
-    }
     rows = rows_;
     keysWidth = kw;
     keysHeight = kh;
+    extra_keys = xk;
   }
 
-	public static KeyboardData parse(XmlResourceParser parser)
-	{
-		ArrayList<Row> rows = new ArrayList<Row>();
-
-		try
-		{
-			int status;
-
-			while (parser.next() != XmlResourceParser.START_TAG)
-				continue ;
-			if (!parser.getName().equals("keyboard"))
-				throw new Exception("Unknow tag: " + parser.getName());
-			while ((status = parser.next()) != XmlResourceParser.END_DOCUMENT)
-			{
-				if (status == XmlResourceParser.START_TAG)
-				{
-					String tag = parser.getName();
-					if (tag.equals("row"))
-						rows.add(Row.parse(parser));
-					else
-						throw new Exception("Unknow keyboard tag: " + tag);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-    return new KeyboardData(rows);
-	}
-
-  public KeyboardData removeKeys(MapKeys f)
+  public static class Row
   {
-		ArrayList<Row> rows_ = new ArrayList<Row>();
-    for (Row r : rows)
-      rows_.add(r.removeKeys(f));
-    return new KeyboardData(rows_);
-  }
-
-	public static class Row
-	{
     public final List<Key> keys;
-    /* Height of the row. 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 very keys. Unit is abstract. */
-		private final float keysWidth;
+    /** Total width of the row. */
+    private final float keysWidth;
 
-    public Row(List<Key> keys_, float h, float s)
+    protected Row(List<Key> keys_, float h, float s)
     {
       float kw = 0.f;
       for (Key k : keys_) kw += k.width + k.shift;
@@ -85,34 +141,34 @@ class KeyboardData
       keysWidth = kw;
     }
 
-		public static Row parse(XmlResourceParser parser) throws Exception
-		{
+    public static Row parse(XmlResourceParser parser) throws Exception
+    {
       ArrayList<Key> keys = new ArrayList<Key>();
-			int status;
+      int status;
       float h = parser.getAttributeFloatValue(null, "height", 1f);
       float shift = parser.getAttributeFloatValue(null, "shift", 0f);
-			while ((status = parser.next()) != XmlResourceParser.END_TAG)
-			{
-				if (status == XmlResourceParser.START_TAG)
-				{
-					String tag = parser.getName();
-					if (tag.equals("key"))
-            keys.add(Key.parse(parser));
-					else
-						throw new Exception("Unknow row tag: " + tag);
-				}
-			}
+      while (expect_tag(parser, "key"))
+        keys.add(Key.parse(parser));
       return new Row(keys, h, shift);
-		}
+    }
 
-    public Row removeKeys(MapKeys f)
+    public Row mapKeys(MapKey f)
     {
       ArrayList<Key> keys_ = new ArrayList<Key>();
       for (Key k : keys)
-        keys_.add(k.removeKeys(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)
+    {
+      final float s = newWidth / keysWidth;
+      return mapKeys(new MapKey(){
+        public Key apply(Key k) { return k.scaleWidth(s); }
+      });
+    }
+  }
 
   public static class Key
   {
@@ -121,18 +177,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. */
+    public final boolean edgekeys;
 
-    public Key(KeyValue k0, KeyValue k1, KeyValue k2, KeyValue k3, KeyValue k4, float w, float s)
+    protected Key(Corner k0, Corner k1, Corner k2, Corner k3, Corner k4, float w, float s, boolean e)
     {
       key0 = k0;
       key1 = k1;
@@ -141,54 +199,183 @@ class KeyboardData
       key4 = k4;
       width = w;
       shift = s;
+      edgekeys = e;
     }
 
     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);
       while (parser.next() != XmlResourceParser.END_TAG)
         continue ;
-      return new Key(k0, k1, k2, k3, k4, width, shift);
+      return new Key(k0, k1, k2, k3, k4, width, shift, edgekeys);
     }
 
-    public Key removeKeys(MapKeys f)
+    /** New key with the width multiplied by 's'. */
+    public Key scaleWidth(float s)
     {
-      return new Key(f.map(key0), f.map(key1), f.map(key2), f.map(key3), f.map(key4), width, shift);
+      return new Key(key0, key1, key2, key3, key4, width * s, shift, edgekeys);
+    }
+
+    public KeyValue getKeyValue(int i)
+    {
+      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 Key withKeyValue(int i, KeyValue kv)
+    {
+      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 static abstract interface MapKeys
+  public static final class Corner
   {
-    public abstract KeyValue map(KeyValue k);
-  }
+    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 static class RemoveKeysByFlags implements MapKeys
-  {
-    private final int _flags;
-
-    public RemoveKeysByFlags(int flags) { _flags = flags; }
-
-    public KeyValue map(KeyValue k)
+    protected Corner(KeyValue k, boolean l)
     {
-      return (k == null || (k.flags & _flags) != 0) ? null : k;
+      kv = k;
+      localized = l;
+    }
+
+    public static Corner parse_of_attr(XmlResourceParser parser, String attr) throws Exception
+    {
+      String name = parser.getAttributeValue(null, attr);
+      boolean localized = false;
+
+      if (name == null)
+        return null;
+      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;
     }
   }
 
-  public static class RemoveKeysByEvent implements MapKeys
-  {
-    private final int _eventCode;
+  // Not using Function<KeyValue, KeyValue> to keep compatibility with Android 6.
+  public static abstract interface MapKey {
+    public Key apply(Key k);
+  }
 
-    public RemoveKeysByEvent(int ev) { _eventCode = ev; }
+  public static abstract class MapKeyValues implements MapKey {
+    abstract public KeyValue apply(KeyValue c, boolean localized);
 
-    public KeyValue map(KeyValue k)
+    public Key apply(Key k)
     {
-      return (k == null || k.eventCode == _eventCode) ? null : 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);
+    }
+  }
+
+  /** Parsing utils */
+
+  /** Returns [false] on [END_DOCUMENT] or [END_TAG], [true] otherwise. */
+  private static boolean expect_tag(XmlResourceParser parser, String name) throws Exception
+  {
+    int status;
+    do
+    {
+      status = parser.next();
+      if (status == XmlResourceParser.END_DOCUMENT || status == XmlResourceParser.END_TAG)
+        return false;
+    }
+    while (status != XmlResourceParser.START_TAG);
+    if (!parser.getName().equals(name))
+      throw new Exception("Unknow tag: " + parser.getName());
+    return true;
   }
 }

srcs/juloo.keyboard2/Pointers.java

@@ -0,0 +1,455 @@
+package juloo.keyboard2;
+
+import android.os.Handler;
+import android.os.Message;
+import java.util.Arrays;
+import java.util.ArrayList;
+
+/**
+ * Manage pointers (fingers) on the screen and long presses.
+ * Call back to IPointerEventHandler.
+ */
+public final class Pointers implements Handler.Callback
+{
+  private Handler _keyrepeat_handler;
+  private ArrayList<Pointer> _ptrs = new ArrayList<Pointer>();
+  private IPointerEventHandler _handler;
+  private Config _config;
+
+  public Pointers(IPointerEventHandler h, Config c)
+  {
+    _keyrepeat_handler = new Handler(this);
+    _handler = h;
+    _config = c;
+  }
+
+  /** Return the list of modifiers currently activated. */
+  public Modifiers getModifiers()
+  {
+    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()
+  {
+    _ptrs.clear();
+  }
+
+  public boolean isKeyDown(KeyboardData.Key k)
+  {
+    for (Pointer p : _ptrs)
+      if (p.key == k)
+        return true;
+    return false;
+  }
+
+  /**
+   * These flags can be different:
+   *  FLAG_LOCK   Removed when the key is locked
+   *  FLAG_LOCKED Added when the key is locked
+   *  FLAG_LATCH  Removed when the key is latched (released but not consumed yet)
+   * Returns [-1] if not found.
+   */
+  public int getKeyFlags(KeyValue kv)
+  {
+    for (Pointer p : _ptrs)
+      if (p.value != null && p.value.equals(kv))
+        return p.flags;
+    return -1;
+  }
+
+  // Receiving events
+
+  public void onTouchUp(int pointerId)
+  {
+    Pointer ptr = getPtr(pointerId);
+    if (ptr == null)
+      return;
+    stopKeyRepeat(ptr);
+    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();
+      }
+      else // Otherwise, unlatch
+      {
+        removePtr(latched);
+        _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();
+    }
+    else
+    {
+      clearLatched();
+      removePtr(ptr);
+      _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();
+  }
+
+  /* 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)
+  {
+    // 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.hasFlags(KeyValue.FLAG_SPECIAL))
+      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 = Math.floorMod(direction + i - 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)
+  {
+    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;
+
+    int direction;
+    if (dist < _config.swipe_dist_px)
+    {
+      direction = 0;
+    }
+    else
+    {
+      // 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 (direction != ptr.selected_direction)
+    {
+      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.
+        if ((old_flags & ptr.flags & KeyValue.FLAG_PRECISE_REPEAT) == 0)
+        {
+          stopKeyRepeat(ptr);
+          if ((ptr.flags & KeyValue.FLAG_SPECIAL) == 0)
+            startKeyRepeat(ptr);
+        }
+        _handler.onPointerDown(true);
+      }
+    }
+  }
+
+  // Pointers management
+
+  private Pointer getPtr(int pointerId)
+  {
+    for (Pointer p : _ptrs)
+      if (p.pointerId == pointerId)
+        return p;
+    return null;
+  }
+
+  private void removePtr(Pointer ptr)
+  {
+    _ptrs.remove(ptr);
+  }
+
+  private Pointer getLatched(Pointer target)
+  {
+    KeyboardData.Key k = target.key;
+    KeyValue v = target.value;
+    if (v == null)
+      return null;
+    for (Pointer p : _ptrs)
+      if (p.key == k && p.pointerId == -1 && p.value != null && p.value.equals(v))
+        return p;
+    return null;
+  }
+
+  private void clearLatched()
+  {
+    for (int i = _ptrs.size() - 1; i >= 0; i--)
+    {
+      Pointer ptr = _ptrs.get(i);
+      // 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
+      else if ((ptr.flags & KeyValue.FLAG_LATCH) != 0)
+        ptr.flags &= ~KeyValue.FLAG_LATCH;
+    }
+  }
+
+  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]. */
+  @Override
+  public boolean handleMessage(Message msg)
+  {
+    for (Pointer ptr : _ptrs)
+    {
+      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, ptr.modifiers);
+        return (true);
+      }
+    }
+    return (false);
+  }
+
+  private static int uniqueTimeoutWhat = 0;
+
+  private void startKeyRepeat(Pointer ptr)
+  {
+    int what = (uniqueTimeoutWhat++);
+    ptr.timeoutWhat = what;
+    long timeout = _config.longPressTimeout;
+    // Faster repeat timeout for modulated keys
+    if ((ptr.flags & KeyValue.FLAG_PRECISE_REPEAT) != 0)
+      timeout /= 2;
+    _keyrepeat_handler.sendEmptyMessageDelayed(what, timeout);
+  }
+
+  private void stopKeyRepeat(Pointer ptr)
+  {
+    if (ptr.timeoutWhat != -1)
+    {
+      _keyrepeat_handler.removeMessages(ptr.timeoutWhat);
+      ptr.timeoutWhat = -1;
+      ptr.repeatingPtrDist = -1.f;
+    }
+  }
+
+  private float modulatePreciseRepeat(Pointer ptr)
+  {
+    if (ptr.repeatingPtrDist < 0.f)
+      ptr.repeatingPtrDist = ptr.ptrDist; // First repeat
+    if (ptr.ptrDist > ptr.repeatingPtrDist * 2.f)
+      ptr.repeatingPtrDist = ptr.ptrDist / 2.f; // Large swipe, move the middle point
+    float left = ptr.repeatingPtrDist / 2.f;
+    float accel = (ptr.ptrDist - left) / (ptr.repeatingPtrDist - left);
+    return Math.min(8.f, Math.max(0.1f, accel));
+  }
+
+  private static final class Pointer
+  {
+    /** -1 when latched. */
+    public int pointerId;
+    /** 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, Modifiers m)
+    {
+      pointerId = p;
+      key = k;
+      selected_direction = 0;
+      value = v;
+      downX = x;
+      downY = y;
+      ptrDist = 0.f;
+      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
+  {
+    /** 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();
+
+    /** Key is repeating. */
+    public void onPointerHold(KeyValue k, Modifiers flags);
+  }
+}