Release 1.22.1

Launcher activity: Fix crash on API < 28
Do not lock modifiers if sliding a key
2023-04-10 13:18:24 +02:00 · 2023-04-10 13:15:59 +02:00 · 2023-04-10 13:14:50 +02:00 · 2023-04-02 17:27:44 +02:00 · 2023-04-02 17:16:56 +02:00 · 2023-04-02 13:29:53 +02:00
46 changed files with 653 additions and 360 deletions
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="32" android:versionName="1.21.0" android:hardwareAccelerated="false">
-  <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="31"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="34" android:versionName="1.22.1" android:hardwareAccelerated="false">
+  <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="33"/>
  <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" android:exported="true" android:directBootAware="true">
      <intent-filter>
@@ -13,6 +13,12 @@
        <action android:name="android.intent.action.MAIN"/>
      </intent-filter>
    </activity>
+    <activity android:name="juloo.keyboard2.LauncherActivity" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
  </application>
  <uses-permission android:name="android.permission.VIBRATE"/>
  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -0,0 +1,7 @@
+New layouts: Arabic, Devanagari
+
+Updated translations.
+Updated layouts.
+Bugs fixed.
+
+Thanks to the contributors: @ChasmSolacer, @mostafaayesh, @lrvideckis, @eandersons, @mscheidemann, @JackDotJS
@@ -0,0 +1,3 @@
+Bug fixes.
+
+Thanks to the contributors: @doak
@@ -1,18 +1,16 @@
-Ta aplikacja to klawiatura wirtualna dla Androida. Jej główne funkcjonalności obejmują łatwe wprowadzanie każdego znaku ASCII przy użyciu gestu przesunięcia, martwe klawisze dla znaków diakrytycznych i klawisze modyfikujące oraz obecność klawiszy specjalnych (tab, esc, strzałki, itp.).
-
-Klawiatura mieści do czterech dodatkowych znaków w rogach każdego klawisza. Są one wprowadzane poprzez przesuwanie palcem po klawiszu.
+Jej główną cechą jest łatwość wprowadzania wielu znaków poprzez przesuwanie po klawiszu do rogu.

 Wyróźnione funkcjonalności:

- Wszystkie znaki i klawisze specjalne, które są również dostępne na klawiaturze komputerowej. Doskonałe do korzystania z aplikacji takich jak Termux.
+- Wszystkie znaki i klawisze specjalne dostępne na klawiaturze komputerowej. Doskonałe do korzystania z aplikacji takich jak Termux.

- Obejmują one Tab, Esc, strzałki, klawisze funkcyjne oraz Ctrl i Alt !
+- Obejmują one Tab, Esc, strzałki, klawisze funkcyjne, a także Ctrl i Alt.

 - Znaki akcentowane uzyskuje się za pomocą martwych klawiszy. Najpierw naciśnij akcent, a następnie wpisz akcentowaną literę.

 - Bardzo lekka i szybka. Zajmuje 500x mniej miejsca niż klawiatura Google i 15x mniej niż klawiatura domyślna. Bez reklam, bez śledzenia.

- Wiele układów: QWERTY, QWERTZ, AZERTY. Motywy: Biały, Ciemny, Czarny (OLED). Oraz wiele innych możliwości.
+- Wiele układów: QWERTY, QWERTZ, AZERTY. Motywy: Biały, Ciemny, Czarny (OLED). Oraz wiele innych ustawień.

 Tak jak każda inna klawiatura ekranowa, należy ją włączyć w ustawieniach systemowych. Otwórz Ustawienia i przejdź kolejno do:
 System > Języki i metody wprowadzania > Klawiatura ekranowa > Zarządzaj klawiaturami ekranowymi.
@@ -1 +1 @@
-Lekka klawiatura wirtualna dla programistów.
+Lekka klawiatura wirtualna dla programistów.
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
+  <TextView style="@style/paragraph" android:text="@string/launcher_description"/>
+  <Button style="@style/paragraph" android:text="@string/launcher_button_imesettings" android:onClick="launch_imesettings" android:layout_width="wrap_content"/>
+  <TextView style="@style/paragraph" android:text="@string/launcher_sourcecode" android:autoLink="web"/>
+  <TextView android:id="@+id/launcher_tryhere_text" style="@style/paragraph" android:text="@string/launcher_tryhere"/>
+  <EditText android:id="@+id/launcher_tryhere_area" style="@style/paragraph" android:inputType="text"/>
+</LinearLayout>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <string name="pref_autocapitalisation_title">Automatická kapitalizace</string>
  <string name="pref_autocapitalisation_summary">Stiskne Shift na začátku věty</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Vibrace</string>
  <string name="pref_vibrate_summary">Zapnout/Vypnout vibrace při stisku klávesy</string>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">Tmavý</string>
  <string name="pref_theme_e_light">Světlý</string>
  <string name="pref_theme_e_black">Černý</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Velmi krátká</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Předchozí</string>
  <string name="key_action_search">Hledat</string>
  <string name="key_action_send">Odeslat</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -3,16 +3,16 @@
  <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 - Einstellungen</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">Im Hochformatmodus</string>
+  <string name="pref_landscape">Im Querformatmodus</string>
  <string name="pref_category_layout">Layout</string>
-  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_label_brightness">Helligkeit der Beschriftung anpassen</string>
+  <string name="pref_keyboard_opacity">Deckkraft des Tastaturhintergrunds anpassen</string>
+  <string name="pref_key_opacity">Deckkraft der Tasten anpassen</string>
+  <string name="pref_key_activated_opacity">Deckkraft gedrückter Tasten anpassen</string>
  <string name="pref_layout_title">Tastaturlayout ändern</string>
  <string name="pref_layout_e_system">Systemeinstellung</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">Eigenes Layout</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>
@@ -21,13 +21,13 @@
  <string name="pref_show_numpad_never">Nie</string>
  <string name="pref_show_numpad_landscape">Nur im Querformat</string>
  <string name="pref_show_numpad_always">Immer</string>
-  <!-- <string name="pref_number_row_title">Show number row</string> -->
-  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
+  <string name="pref_number_row_title">Zahlenreihe anzeigen</string>
+  <string name="pref_number_row_summary">Eine Zahlenreihe oben an der Tastatur hinzufügen, wenn der Ziffernblock ausgeblendet ist</string>
+  <string name="pref_numpad_layout">Zahlenblock-Layout</string>
+  <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string>
+  <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string>
  <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
-  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
+  <string name="pref_second_layout_title">Zweites Layout</string>
  <string name="pref_second_layout_none">Keines</string>
  <string name="pref_category_typing">Tippen</string>
  <string name="pref_swipe_dist_title">Länge der Wischgeste</string>
@@ -36,11 +36,11 @@
  <string name="pref_long_interval_title">Intervall der Tastenwiederholung</string>
  <string name="pref_lock_double_tap_title">Umschalttaste mit Doppeltippen einrasten</string>
  <string name="pref_lock_double_tap_summary">Anstatt Taste längere Zeit gedrückt zu halten</string>
-  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <string name="pref_category_behavior">Verhalten</string>
  <string name="pref_autocapitalisation_title">Automatische Großschreibung</string>
-  <string name="pref_autocapitalisation_summary">Shift-Taste am Satzanfang aktivieren</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
-  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_autocapitalisation_summary">Umschalttaste am Satzanfang aktivieren</string>
+  <string name="pref_switch_input_immediate_title">Sofort zur nächsten Tastatur wechseln</string>
+  <string name="pref_switch_input_immediate_summary">Verhalten der Tastaturumschalttaste</string>
  <string name="pref_vibrate_title">Vibration</string>
  <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
  <string name="pref_category_style">Design</string>
@@ -49,13 +49,14 @@
  <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">Thema</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_theme_e_altblack">Alternative Black</string> -->
  <string name="pref_theme_e_white">Weiß</string>
-  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
+  <string name="pref_theme_e_epaper">ePaper</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>
@@ -63,13 +64,17 @@
  <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="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <string name="pref_category_advanced">Erweitert</string>
+  <string name="pref_custom_layout_title">Eigenes Layout</string>
+  <string name="pref_custom_layout_summary">Bitte Sourcecode ansehen. Diese Option ist nicht zur Verwendung vorgesehen.</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>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Vibración</string>
  <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
@@ -54,6 +54,7 @@
  <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_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Muy corto</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Anterior</string>
  <string name="key_action_search">Buscar</string>
  <string name="key_action_send">Enviar</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">Sombre</string>
  <string name="pref_theme_e_light">Clair</string>
  <string name="pref_theme_e_black">Noir</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <string name="pref_theme_e_white">Blanc</string>
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Très courte</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Prec.</string>
  <string name="key_action_search">Chercher</string>
  <string name="key_action_send">Envoyer</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <string name="pref_autocapitalisation_title">Maiuscole Automatiche</string>
  <string name="pref_autocapitalisation_summary">Premi Shift all\'inizio di una frase</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Vibrazione</string>
  <string name="pref_vibrate_summary">Abilita/Disabilita Vibrazione alla pressione dei tasti</string>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">Scuro</string>
  <string name="pref_theme_e_light">Chiaro</string>
  <string name="pref_theme_e_black">Nero</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Veramente breve</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Precedente</string>
  <string name="key_action_search">Cerca</string>
  <string name="key_action_send">Invia</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">진동</string>
  <string name="pref_vibrate_summary">키 누를 때 진동 키거/끄기</string>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">Dark</string>
  <string name="pref_theme_e_light">Light</string>
  <string name="pref_theme_e_black">Black</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">매우 짧음</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">이전</string>
  <string name="key_action_search">검색</string>
  <string name="key_action_send">보내기</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -3,16 +3,16 @@
  <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_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">Stateniski</string>
+  <string name="pref_landscape">Guleniski</string>
  <string name="pref_category_layout">Izkārtojums</string>
-  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_label_brightness">Pielāgot iezīmju spilgtumu</string>
+  <string name="pref_keyboard_opacity">Pielāgot tastatūras fona necaurredzamību</string>
+  <string name="pref_key_opacity">Pielāgot taustiņu necaurredzamību</string>
+  <string name="pref_key_activated_opacity">Pielāgot piespiesta taustiņa necaurredzamību</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_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">Pielāgots izkārtojums</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>
@@ -21,13 +21,13 @@
  <string name="pref_show_numpad_never">Nekad</string>
  <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
  <string name="pref_show_numpad_always">Vienmēr</string>
-  <!-- <string name="pref_number_row_title">Show number row</string> -->
-  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
+  <string name="pref_number_row_title">Rādīt ciparu rindu</string>
+  <string name="pref_number_row_summary">Pievienot ciparu rindu virs tastatūras, kad ciparnīca ir paslēpta</string>
+  <string name="pref_numpad_layout">Ciparnīcas izkārtojums</string>
+  <string name="pref_numpad_layout_e_high_first">Vispirms lielākie cipari</string>
+  <string name="pref_numpad_layout_e_low_first">Vispirms mazākie cipari</string>
  <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
-  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
+  <string name="pref_second_layout_title">Otrējais izkārtojums</string>
  <string name="pref_second_layout_none">Neviens</string>
  <string name="pref_category_typing">Rakstīšana</string>
  <string name="pref_swipe_dist_title">Pavilkšanas attālums</string>
@@ -36,11 +36,11 @@
  <string name="pref_long_interval_title">Taustiņa atkārtošanās aizture</string>
  <string name="pref_lock_double_tap_title">Divkāršs piesitiens burtslēgam</string>
  <string name="pref_lock_double_tap_summary">Tā vietā, lai ilstoši piespiestu pārveidotāju</string>
-  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <string name="pref_category_behavior">Uzvedība</string>
  <string name="pref_autocapitalisation_title">Automātiski lielie burti</string>
  <string name="pref_autocapitalisation_summary">Piespiest Shift teikuma sākumā</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
-  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_switch_input_immediate_title">Pārslēgties uz pēdējo izmantoto tastatūru</string>
+  <string name="pref_switch_input_immediate_summary">Tastatūras pārslēgšanas taustiņa uzvedība</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_category_style">Izskata pielāgojumi</string>
@@ -54,8 +54,9 @@
  <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_theme_e_altblack">Citādi melns</string>
  <string name="pref_theme_e_white">Balts</string>
-  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
+  <string name="pref_theme_e_epaper">ePapīrs</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>
@@ -63,13 +64,17 @@
  <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="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <string name="pref_category_advanced">Papildu</string>
+  <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
+  <string name="pref_custom_layout_summary">Skatīt pirmkodu. Šī iespēja nav paredzēta izmantošanai.</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>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -3,8 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Ustawienia Unexpected Keyboard</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">W widoku pionowym</string>
+  <string name="pref_landscape">W widoku poziomym</string>
  <string name="pref_category_layout">Układ</string>
  <string name="pref_label_brightness">Dostosuj jasność znaków</string>
  <string name="pref_keyboard_opacity">Nieprzezroczystość tła klawiatury</string>
@@ -21,8 +21,8 @@
  <string name="pref_show_numpad_never">Nigdy</string>
  <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
  <string name="pref_show_numpad_always">Zawsze</string>
-  <!-- <string name="pref_number_row_title">Show number row</string> -->
-  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
+  <string name="pref_number_row_title">Pokaż rząd cyfr</string>
+  <string name="pref_number_row_summary">Dodaj rząd cyfr na górze klawiatury, kiedy klaw. numeryczna jest schowana</string>
  <string name="pref_numpad_layout">Układ klawiatury numerycznej</string>
  <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string>
  <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string>
@@ -36,11 +36,11 @@
  <string name="pref_long_interval_title">Czas pomiędzy powtórzeniami</string>
  <string name="pref_lock_double_tap_title">Naciśnij Shift podwójnie, aby włączyć caps lock</string>
  <string name="pref_lock_double_tap_summary">Możesz zablokować modyfikator poprzez jego długie naciśnięcie</string>
-  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <string name="pref_category_behavior">Zachowanie</string>
  <string name="pref_autocapitalisation_title">Automatyczne wielkie litery</string>
  <string name="pref_autocapitalisation_summary">Naciśnij Shift na początku zdania</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
-  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_switch_input_immediate_title">Przełącz na ostatnio używaną klawiaturę</string>
+  <string name="pref_switch_input_immediate_summary">Działanie klawisza przełączającego klawiaturę</string>
  <string name="pref_vibrate_title">Wibracja</string>
  <string name="pref_vibrate_summary">Wł./wył. wibrację przy naciśnięciu klawisza</string>
  <string name="pref_category_style">Styl</string>
@@ -54,8 +54,9 @@
  <string name="pref_theme_e_dark">Ciemny</string>
  <string name="pref_theme_e_light">Jasny</string>
  <string name="pref_theme_e_black">Czarny</string>
+  <string name="pref_theme_e_altblack">Alternatywny Czarny</string>
  <string name="pref_theme_e_white">Biały</string>
-  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
+  <string name="pref_theme_e_epaper">e-paper</string>
  <string name="pref_swipe_dist_e_very_short">Bardzo mała</string>
  <string name="pref_swipe_dist_e_short">Mała</string>
  <string name="pref_swipe_dist_e_default">Normalna</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Wstecz</string>
  <string name="key_action_search">Szukaj</string>
  <string name="key_action_send">Wyślij</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <string name="pref_autocapitalisation_title">Maiusculização automática</string>
  <string name="pref_autocapitalisation_summary">Aciona o shift no início de cada frase</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Vibração</string>
  <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
@@ -54,6 +54,7 @@
  <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_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Muito curto</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Anterior</string>
  <string name="key_action_search">Buscar</string>
  <string name="key_action_send">Enviar</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <string name="pref_autocapitalisation_title">Автоматическая смена регистра</string>
  <string name="pref_autocapitalisation_summary">Автонажатие Shift в начале каждого предложения</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Вибрация</string>
  <string name="pref_vibrate_summary">Включение/выключение вибрации при нажатии клавиши</string>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">Темная</string>
  <string name="pref_theme_e_light">Светлая</string>
  <string name="pref_theme_e_black">Черная</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <string name="pref_theme_e_white">Белая</string>
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Очень близко</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Предыдущий</string>
  <string name="key_action_search">Поиск</string>
  <string name="key_action_send">Отправить</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Titreşim</string>
  <string name="pref_vibrate_summary">Tuşa basıldığında titreşimi etkinleştir</string>
@@ -54,6 +54,7 @@
  <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_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Çok kısa</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Geri</string>
  <string name="key_action_search">Ara</string>
  <string name="key_action_send">Gönder</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -41,7 +41,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <string name="pref_autocapitalisation_title">Tự động viết hoa</string>
  <string name="pref_autocapitalisation_summary">Nhấn Shift ở đầu câu</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">Sự rung</string>
  <string name="pref_vibrate_summary">Bật/tắt rung khi nhấn</string>
@@ -56,6 +56,7 @@
  <string name="pref_theme_e_dark">Tối</string>
  <string name="pref_theme_e_light">Sáng</string>
  <string name="pref_theme_e_black">Đen</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <string name="pref_theme_e_white">Trắng</string>
  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_swipe_dist_e_very_short">Rất gần</string>
@@ -74,4 +75,8 @@
  <string name="key_action_prev">Trước</string>
  <string name="key_action_search">Tìm</string>
  <string name="key_action_send">Gửi</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -39,7 +39,7 @@
  <!-- <string name="pref_category_behavior">Behavior</string> -->
  <string name="pref_autocapitalisation_title">句首自动大写</string>
  <string name="pref_autocapitalisation_summary">在句子的开头自动按下Shift</string>
-  <!-- <string name="pref_switch_input_immediate_title">Switch to the next keyboard immediately</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
  <string name="pref_vibrate_title">振动</string>
  <string name="pref_vibrate_summary">启用或者禁用按下按键时振动</string>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">暗色</string>
  <string name="pref_theme_e_light">亮色</string>
  <string name="pref_theme_e_black">黑色</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <string name="pref_theme_e_white">白色</string>
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">非常短</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">前一项</string>
  <string name="key_action_search">搜索</string>
  <string name="key_action_send">发送</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
@@ -28,9 +28,12 @@
    <item>bone</item>
    <item>jcuken_ua</item>
    <item>bangla</item>
-    <item>hindi</item>
+    <item>devanagari_1</item>
+    <item>devanagari_2</item>
    <item>he_il_1452_1</item>
    <item>he_il_1452_2</item>
+    <item>ar_pc</item>
+    <item>ar_alt</item>
    <item>custom</item>
  </string-array>
  <string-array name="pref_layout_entries">
@@ -61,9 +64,12 @@
    <item>Bone</item>
    <item>ЙЦУКЕН (Українська)</item>
    <item>বাংলা</item>
-    <item>हिन्दी</item>
+    <item>देवनागरी (हिंदी)-1</item>
+    <item>देवनागरी (हिंदी)-2</item>
    <item>Hebrew SI-1452-1</item>
    <item>Hebrew SI-1452-2</item>
+    <item>Arabic PC</item>
+    <item>Arabic ALT</item>
    <item>@string/pref_layout_e_custom</item>
  </string-array>
  <string-array name="pref_accents_entries">
@@ -99,6 +105,7 @@
    <item>@string/pref_theme_e_dark</item>
    <item>@string/pref_theme_e_light</item>
    <item>@string/pref_theme_e_black</item>
+    <item>@string/pref_theme_e_altblack</item>
    <item>@string/pref_theme_e_white</item>
    <item>@string/pref_theme_e_epaper</item>
  </string-array>
@@ -107,6 +114,7 @@
    <item>dark</item>
    <item>light</item>
    <item>black</item>
+    <item>altblack</item>
    <item>white</item>
    <item>epaper</item>
  </string-array>
@@ -54,6 +54,7 @@
  <string name="pref_theme_e_dark">Dark</string>
  <string name="pref_theme_e_light">Light</string>
  <string name="pref_theme_e_black">Black</string>
+  <string name="pref_theme_e_altblack">Alternative Black</string>
  <string name="pref_theme_e_white">White</string>
  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_swipe_dist_e_very_short">Very short</string>
@@ -72,4 +73,8 @@
  <string name="key_action_prev">Prev</string>
  <string name="key_action_search">Search</string>
  <string name="key_action_send">Send</string>
+  <string name="launcher_button_imesettings">Enable keyboard</string>
+  <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string>
+  <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
 </resources>
@@ -24,4 +24,11 @@
    <item name="android:textSize">@dimen/emoji_text_size</item>
    <item name="android:textColor">?attr/emoji_color</item>
  </style>
+  <style name="paragraph">
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginVertical">8dp</item>
+    <item name="android:layout_marginHorizontal">16dp</item>
+    <item name="android:layout_gravity">center</item>
+  </style>
 </resources>
@@ -96,6 +96,9 @@
    <item name="emoji_button_bg">#000000</item>
    <item name="emoji_color">#ffffff</item>
  </style>
+  <style name="AltBlack" parent="Black">
+    <item name="keyBorderWidth">1dp</item>
+  </style>
  <style name="White" parent="BaseTheme">
    <item name="android:isLightTheme">true</item>
    <item name="colorKeyboard">#ffffff</item>
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="ض" key2="١" key3="`" key4="esc"/>
+    <key key0="ص" key2="٢" key3="\@"/>
+    <key key0="ث" key2="٣" key3="\#"/>
+    <key key0="ق" key2="٤" key3="$"/>
+    <key key0="ف" key2="٥" key3="%"/>
+    <key key0="غ" key2="٦" key3="^"/>
+    <key key0="ع" key2="٧" key3="&amp;"/>
+    <key key0="ه" key2="٨" key3="*"/>
+    <key key0="خ" key2="٩" key3="("/>
+    <key key0="ح" key2="٠" key3=")"/>
+    <key key0="ج"/>
+  </row>
+  <row>
+    <key key0="ش" key4="tab"/>
+    <key key0="س"/>
+    <key key0="ي"/>
+    <key key0="ب"/>
+    <key key0="ل"/>
+    <key key0="ا" key1="أ"/>
+    <key key0="ت"/>
+    <key key0="ن"/>
+    <key key0="م"/>
+    <key key0="ك"/>
+    <key key0="ط"/>
+  </row>
+  <row>
+    <key key0="ذ"/>
+    <key key0="ء"/>
+    <key key0="ؤ" key1="{"/>
+    <key key0="ر" key1="}"/>
+    <key key0="ى" key1="ئ"/>
+    <key key0="ة"/>
+    <key key0="و" key3=","/>
+    <key key0="ز" key3="."/>
+    <key key0="ظ" key3="&#1567;"/>
+    <key key0="د"/>
+    <key width="1.0" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="ض" key1="&#1614;" key2="١" key3="`" key4="esc"/>
+    <key key0="ص" key1="&#1611;" key2="٢" key3="\@"/>
+    <key key0="ث" key1="&#1615;" key2="٣" key3="\#" key4="loc €"/>
+    <key key0="ق" key1="&#1612;" key2="٤" key3="$" key4="loc £"/>
+    <key key0="ف" key1="&#1604;&#1573;" key2="٥" key3="%"/>
+    <key key0="غ" key1="&#1573;" key2="٦" key3="^"/>
+    <key key0="ع" key1="&#8216;" key2="٧" key3="&amp;"/>
+    <key key0="ه" key1="&#0247;" key2="٨" key3="*"/>
+    <key key0="خ" key1="&#0215;" key2="٩" key3="("/>
+    <key key0="ح" key1="&#1563;" key2="٠" key3=")"/>
+    <key key0="ج" key1="&gt;" key2="-" key3="_"/>
+    <key key0="د" key1="&lt;" key2="=" key3="ذ"/>
+    <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
+  </row>
+  <row>
+    <key shift="0.5" key0="ش" key1="&#1616;" key4="tab"/>
+    <key key0="س" key1="&#1613;"/>
+    <key key0="ي" key1="["/>
+    <key key0="ب" key1="]"/>
+    <key key0="ل" key1="&#1604;&#1571;"/>
+    <key key0="ا" key1="أ"/>
+    <key key0="ت" key1="ـ"/>
+    <key key0="ن" key1="&#1548;"/>
+    <key key0="م" key1="/"/>
+    <key key0="ك" key1=":"/>
+    <key key0="ط" key1="&quot;"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="ئ" key1="~"/>
+    <key key0="ء" key1="&#1618;"/>
+    <key key0="ؤ" key1="{"/>
+    <key key0="ر" key1="}"/>
+    <key key0="لا" key1="&#1604;&#1570;"/>
+    <key key0="ى" key1="&#1570;"/>
+    <key key0="ة" key1="&#8217;"/>
+    <key key0="و" key1=","/>
+    <key key0="ز" key1="."/>
+    <key key0="ظ" key1="&#1567;"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
@@ -38,8 +38,8 @@
 	<row height="0.95">
 		<key width="1.8" key0="ctrl"						key2="loc meta" 								key4="switch_numeric"/>
 		<key width="1.2" key0="fn"		key1="loc alt"			key2="change_method"	key3="switch_emoji" key4="config"/>
-		<key width="4.0" key0="space"	key1="switch_second"					key2="0" 			edgekeys="true"/>
-		<key width="1.2" 				key1="up"			key2="right" 			key3="left" 		key4="down" edgekeys="true"/>
+		<key width="4.0" key0="space"	key7="switch_second"					key8="0"/>
+		<key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
 		<key width="1.8" key0="enter"												key3="action"/>
 	</row>
 </keyboard>
@@ -2,7 +2,7 @@
 <row height="0.95">
  <key width="1.7" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
  <key width="1.1" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-  <key width="4.4" key0="space" key1="switch_second" key3="left" key2="right" edgekeys="true" slider="true"/>
-  <key width="1.1" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+  <key width="4.4" key0="space" key7="switch_second" key5="left" key6="right" slider="true"/>
+  <key width="1.1" key7="up" key6="right" key5="left" key8="down"/>
  <key width="1.7" key0="enter" key2="action"/>
 </row>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key shift="0.35" width="0.9" key0="क" key1="ख" key2="घ" key3="ङ"  key4="ग"/>
+    <key              width="0.9" key0="च" key1="छ" key2="झ" key3="ञ"  key4="ज"/>
+    <key              width="0.9" key0="ट" key1="ठ" key2="ढ" key3="ण"  key4="ड"/>
+    <key              width="0.9" key0="त" key1="थ" key2="ध" key3="न"  key4="द"/>
+    <key              width="0.9" key0="प" key1="फ" key2="भ" key3="म"  key4="ब"/>
+    <key              width="0.9" key0="र" key1="ज्ञ" key2="ल" key3="य"  key4="व"/>
+    <key              width="0.9" key0="ह" key1="श" key2="ळ" key3="स"  key4="ष"/>
+  </row>
+  <row>
+    <key shift="0.35" width="0.9" key0="ा" key1="अ" key2="आ"/>
+    <key              width="0.9" key0="ि" key1="इ"/>
+    <key              width="0.9" key0="ी" key1="ई"/>
+    <key              width="0.9" key0="ु" key1="उ" key2="ऊ" key4="ू"/>
+    <key              width="0.9" key0="े" key1="ए" key2="ऋ" key4="ृ"/>
+    <key              width="0.9" key0="ै" key1="ऐ" key2="ऌ" key4="ॢ"/>
+    <key              width="0.9" key0="ो" key1="ओ" key2="औ" key4="ौ"/>
+  </row>
+  <row>
+    <key key0="्" key2="tab" key4="esc"/>
+    <key key0="ँ" key1="₹" key2="॑" key3="ॖ" key4="॓"/>
+    <key key0="ं" key1="ॐ" key2="ऽ" key3="ः" key4="&quot;"/>
+    <key key0="।" key1="," key2=";" key3="!" key4="\?"/>
+    <key key0="़" key1="॰" key2="०" key3="-" key4="॒"/>
+    <key key0="५" key1="१" key2="३" key3="७" key4="९" key5="४" key6="६" key7="२" key8="८"/>
+    <key key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
@@ -41,7 +41,7 @@
    <key width="1.2" key0="fn"/>
    <key width="2.8" key0="space" key1="superscript" key3="subscript"/>
    <key width="1.2" key0="0" key2="."/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+    <key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
    <key width="1.2" key0="enter" key1="=" key2="action"/>
  </row>
 </keyboard>
@@ -2,17 +2,16 @@
 <keyboard>
  <row>
    <key key0="й" key2="1" key4="esc"/>
-    <key key0="ц" key2="2" key3="\@" key4="~"/>
-    <key key0="у" key2="3" key3="\#" key4="!"/>
+    <key key0="ц" key1="loc ї" key2="2" key3="\@" key4="~"/>
+    <key key0="у" key1="loc ў" 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="н" key1="loc є" key2="6" key3="^"/>
+    <key key0="г" key1="loc ґ" key2="7" key3="&amp;"/>
    <key key0="ш" key2="8" key3="*"/>
    <key key0="щ" key2="9" key3="(" key4=")"/>
-    <key key0="з" key2="0" 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="`"/>
@@ -33,7 +32,7 @@
    <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="и" key1="loc і" 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=";"/>
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="juloo.keyboard2.SettingsActivity" android:supportsSwitchingToNextInputMethod="true">
+  <subtype android:label="%s" android:languageTag="ar" android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=ar_pc"/>
+  <subtype android:label="%s" android:languageTag="be" android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=ru_jcuken,extra_keys=ґ|є|і|ї|ў"/>
  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=bgph1,extra_keys=€"/>
  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=৳"/>
-  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=hindi,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_cs,extra_keys=a|accent_cedille|accent_circonflexe"/>
  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_de,extra_keys=accent_trema|ß|€"/>
+  <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_el,extra_keys=£|€"/>
  <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="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=he_il_1452_1,extra_keys=₪|€"/>
+  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+  <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|€"/>
@@ -19,11 +25,9 @@
  <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_pl"/>
  <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="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_sv_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
-  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=jcuken_ua"/>
-  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_cs,extra_keys=a|accent_cedille|accent_circonflexe"/>
-  <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_el,extra_keys=£|€"/>
-  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
+  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=jcuken_ua,extra_keys=ґ|є|і|ї"/>
  <subtype android:label="%s" android:languageTag="vi" android:imeSubtypeLocale="vi_VN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_vi"/>
 </input-method>
@@ -41,8 +41,8 @@
  <row height="0.95">
 	  <key width="1.8" key0="ctrl" key2="loc meta" key4="switch_numeric"/>
 	  <key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-	  <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
-	  <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+	  <key width="4.0" key0="space" key7="switch_second"/>
+	  <key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
 	  <key key0="j" key4=";"/>
 	  <key width="1.8" key0="enter" key2="action"/>
 	</row>
@@ -13,7 +13,7 @@
    <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="5" key7="up" key6="right" key5="left" key8="down"/>
    <key key0="6"/>
    <key width="0.75" key0="+" key1="Σ" key2="$"/>
    <key width="0.75" key0="-" key1="^"/>
@@ -21,7 +21,7 @@
  <row>
    <key shift="1.0" key0="*" key1="switch_text" key3="switch_numeric"/>
    <key key0="0" key3="+" key4="space"/>
-    <key key0="\#" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+    <key key0="\#" key7="up" key6="right" key5="left" key8="down"/>
    <key key0="enter" key2="action"/>
  </row>
 </keyboard>
@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This file defines the QWERTY layout.
+
+A layout is made of keys arranged into rows. Keys can be made bigger with the
+'width' attribute and blank space can be added on the left of a key with the
+'shift' attribute.
+
+'key0' assigns the symbol on the middle of the key. 'key1', 'key2', etc..
+assign symbols to the corners of a key, they are arranged like this:
+
+  1 7 2
+  5 0 6
+  3 8 4
+
+Keys prefixed with 'loc ' are not visible on the keyboard. They are used to
+specify a place for a key, if it needed to be added to the layout later.
+(for example, by the "Add keys to keyboard" option)
+
+See bottom_row.xml for the definition of the bottom row and neo2.xml for a
+layout that re-defines it.
+See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
+-->
 <keyboard>
  <row>
    <key key0="q" key2="1" key4="esc"/>
@@ -60,9 +60,9 @@
  <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="label_brightness" android:title="@string/pref_label_brightness" android:summary="%s%%" android:defaultValue="100" min="50" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="keyboard_opacity" android:title="@string/pref_keyboard_opacity" android:summary="%s%%" android:defaultValue="100" min="30" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="key_opacity" android:title="@string/pref_key_opacity" android:summary="%s%%" android:defaultValue="100" min="30" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="key_activated_opacity" android:title="@string/pref_key_activated_opacity" android:summary="%s%%" android:defaultValue="100" min="30" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="keyboard_opacity" android:title="@string/pref_keyboard_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="key_opacity" android:title="@string/pref_key_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="key_activated_opacity" android:title="@string/pref_key_activated_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
    <PreferenceScreen android:title="@string/pref_margin_bottom_title">
      <juloo.common.IntSlideBarPreference android:key="margin_bottom_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="7" min="0" max="100"/>
      <juloo.common.IntSlideBarPreference android:key="margin_bottom_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="3" min="0" max="100"/>
@@ -182,8 +182,6 @@ final class Config
      extra_keys.addAll(extra_keys_subtype);
    extra_keys.addAll(extra_keys_param);
    boolean number_row = this.number_row && !show_numpad;
-    if (show_numpad)
-      KeyboardData.num_pad.getKeys(remove_keys);
    if (number_row)
      KeyboardData.number_row.getKeys(remove_keys);
    kw = kw.mapKeys(new KeyboardData.MapKeyValues() {
@@ -321,6 +319,7 @@ final class Config
    {
      case "light": return R.style.Light;
      case "black": return R.style.Black;
+      case "altblack": return R.style.AltBlack;
      case "dark": return R.style.Dark;
      case "white": return R.style.White;
      case "epaper": return R.style.ePaper;
@@ -349,7 +348,8 @@ final class Config
      case "bone": id = R.xml.bone; break;
      case "colemak": id = R.xml.colemak; break;
      case "dvorak": id = R.xml.dvorak; break;
-      case "hindi": id = R.xml.hindi; break;
+      case "devanagari_1": id = R.xml.devanagari_1; break;
+      case "devanagari_2": id = R.xml.devanagari_2; break;
      case "jcuken_ua": id = R.xml.jcuken_ua; break;
      case "neo2": id = R.xml.neo2; break;
      case "qwerty": id = R.xml.qwerty; break;
@@ -372,6 +372,8 @@ final class Config
      case "ru_jcuken": id = R.xml.local_ru_jcuken; break;
      case "he_il_1452_1": id = R.xml.he_il_1452_1; break;
      case "he_il_1452_2": id = R.xml.he_il_1452_2; break;
+      case "ar_pc": id = R.xml.ar_pc; break;
+      case "ar_alt": id = R.xml.ar_alt; break;
    }
    return KeyboardData.load(res, id);
  }
@@ -281,6 +281,62 @@ class KeyModifier
      case 'ס': return "segol";
      case 'ב': return "hataf_segol"; // reduced segol
      case 'צ': return "tsere";
+      // Devanagari symbols
+      case 'ए': return "ऍ";
+      case 'े': return "ॅ";
+      case 'ऐ': return "ऎ";
+      case 'ै': return "ॆ";
+      case 'ऋ': return "ॠ";
+      case 'ृ': return "ॄ";
+      case 'ळ': return "ऴ";
+      case 'र': return "ऱ";
+      case 'क': return "क़";
+      case 'ख': return "ख़";
+      case 'ग': return "ग़";
+      case 'घ': return "ॻ";
+      case 'ढ': return "ढ़";
+      case 'न': return "ऩ";
+      case 'ड': return "ड़";
+      case 'ट': return "ॸ";
+      case 'ण': return "ॾ";
+      case 'फ': return "फ़";
+      case 'ऌ': return "ॡ";
+      case 'ॢ': return "ॣ";
+      case 'औ': return "ॵ";
+      case 'ौ': return "ॏ";
+      case 'ओ': return "ऒ";
+      case 'ो': return "ॊ";
+      case 'च': return "ॼ";
+      case 'ज': return "ज़";
+      case 'ब': return "ॿ";
+      case 'व': return "ॺ";
+      case 'य': return "य़";
+      case 'अ': return "ॲ";
+      case 'आ': return "ऑ";
+      case 'ा': return "ॉ";
+      case 'झ': return "ॹ";
+      case 'ई': return "ॴ";
+      case 'ी': return "ऻ";
+      case 'इ': return "ॳ";
+      case 'ि': return "ऺ";
+      case 'उ': return "ॶ";
+      case 'ऊ': return "ॷ";
+      case 'ु': return "ऄ";
+      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 "ॽ";
      // other
      case ' ': return "nbsp";
      default: return null;
@@ -202,7 +202,14 @@ final class KeyValue
  @Override
  public boolean equals(Object obj)
  {
-    KeyValue snd = (KeyValue)obj;
+    return sameKey((KeyValue)obj);
+  }
+
+  /** Type-safe alternative to [equals]. */
+  public boolean sameKey(KeyValue snd)
+  {
+    if (snd == null)
+      return false;
    return _symbol.equals(snd._symbol) && _code == snd._code;
  }

@@ -260,7 +260,7 @@ public class Keyboard2 extends InputMethodService
      case InputType.TYPE_CLASS_PHONE:
      case InputType.TYPE_CLASS_DATETIME:
        _currentSpecialLayout =
-          _config.modify_numpad(KeyboardData.load_pin_entry(getResources()));
+          _config.modify_numpad(KeyboardData.load(getResources(), R.xml.pin));
        break;
      default:
        _currentSpecialLayout = null;
@@ -105,10 +105,19 @@ public class Keyboard2View extends View
  {
    if (_keyboard == null || _shift_key == null)
      return;
+    int flags = _pointers.getKeyFlags(_shift_key, _shift_kv);
    if (state)
+    {
+      if (flags != -1 && !lock)
+        return; // Don't replace an existing pointer
      _pointers.add_fake_pointer(_shift_kv, _shift_key, lock);
+    }
    else
+    {
+      if ((flags & KeyValue.FLAG_FAKE_PTR) != 0)
+        return; // Don't remove locked pointers
      _pointers.remove_fake_pointer(_shift_kv, _shift_key);
+    }
    invalidate();
  }

@@ -229,7 +238,6 @@ public class Keyboard2View extends View
    int width = dm.widthPixels;
    int height =
      (int)(_config.keyHeight * _keyboard.keysHeight
-          + _keyboard.rows.size()
          + _config.marginTop + _config.margin_bottom);
    setMeasuredDimension(width, height);
    _keyWidth = (width - (_config.horizontal_margin * 2)) / _keyboard.keysWidth;
@@ -252,6 +260,19 @@ public class Keyboard2View extends View
    }
  }

+  /** Horizontal and vertical position of the 9 indexes. */
+  static final Paint.Align[] LABEL_POSITION_H = new Paint.Align[]{
+    Paint.Align.CENTER, Paint.Align.LEFT, Paint.Align.RIGHT, Paint.Align.LEFT,
+    Paint.Align.RIGHT, Paint.Align.LEFT, Paint.Align.RIGHT,
+    Paint.Align.CENTER, Paint.Align.CENTER
+  };
+
+  static final Vertical[] LABEL_POSITION_V = new Vertical[]{
+    Vertical.CENTER, Vertical.TOP, Vertical.TOP, Vertical.BOTTOM,
+    Vertical.BOTTOM, Vertical.CENTER, Vertical.CENTER, Vertical.TOP,
+    Vertical.BOTTOM
+  };
+
  @Override
  protected void onDraw(Canvas canvas)
  {
@@ -274,20 +295,12 @@ public class Keyboard2View extends View
        float keyW = _keyWidth * k.width - _config.keyHorizontalInterval;
        boolean isKeyDown = _pointers.isKeyDown(k);
        drawKeyFrame(canvas, x, y, keyW, keyH, isKeyDown);
-        drawLabel(canvas, k.key0, keyW / 2f + x, y, keyH, isKeyDown);
-        if (k.edgekeys)
+        if (k.keys[0] != null)
+          drawLabel(canvas, k.keys[0], keyW / 2f + x, y, keyH, isKeyDown);
+        for (int i = 1; i < 9; i++)
        {
-          drawSubLabel(canvas, k.key1, x, y, keyW, keyH, Paint.Align.CENTER, Vertical.TOP, isKeyDown);
-          drawSubLabel(canvas, k.key3, x, y, keyW, keyH, Paint.Align.LEFT, Vertical.CENTER, isKeyDown);
-          drawSubLabel(canvas, k.key2, x, y, keyW, keyH, Paint.Align.RIGHT, Vertical.CENTER, isKeyDown);
-          drawSubLabel(canvas, k.key4, x, y, keyW, keyH, Paint.Align.CENTER, Vertical.BOTTOM, isKeyDown);
-        }
-        else
-        {
-          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);
+          if (k.keys[i] != null)
+            drawSubLabel(canvas, k.keys[i], x, y, keyW, keyH, i, isKeyDown);
        }
        if (k.indication != null)
        {
@@ -357,11 +370,9 @@ public class Keyboard2View extends View
    return sublabel ? _theme.subLabelColor : _theme.labelColor;
  }

-  private void drawLabel(Canvas canvas, KeyboardData.Corner k, float x, float y, float keyH, boolean isKeyDown)
+  private void drawLabel(Canvas canvas, KeyValue kv, float x, float y, float keyH, boolean isKeyDown)
  {
-    if (k == null)
-      return;
-    KeyValue kv = KeyModifier.modify(k.kv, _mods);
+    kv = KeyModifier.modify(kv, _mods);
    if (kv == null)
      return;
    float textSize = scaleTextSize(kv, _config.labelTextSize, keyH);
@@ -372,13 +383,12 @@ public class Keyboard2View extends View
    canvas.drawText(kv.getString(), x, (keyH - p.ascent() - p.descent()) / 2f + y, p);
  }

-  private void drawSubLabel(Canvas canvas, KeyboardData.Corner k, float x,
-      float y, float keyW, float keyH, Paint.Align a, Vertical v,
-      boolean isKeyDown)
+  private void drawSubLabel(Canvas canvas, KeyValue kv, float x, float y,
+      float keyW, float keyH, int sub_index, boolean isKeyDown)
  {
-    if (k == null)
-      return;
-    KeyValue kv = KeyModifier.modify(k.kv, _mods);
+    Paint.Align a = LABEL_POSITION_H[sub_index];
+    Vertical v = LABEL_POSITION_V[sub_index];
+    kv = KeyModifier.modify(kv, _mods);
    if (kv == null)
      return;
    float textSize = scaleTextSize(kv, _config.sublabelTextSize, keyH);
@@ -5,6 +5,7 @@ import android.content.res.XmlResourceParser;
 import android.util.Xml;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -74,8 +75,9 @@ class KeyboardData

  public KeyboardData addNumberRow()
  {
-    rows.add(0, number_row.updateWidth(keysWidth));
-    return this;
+    ArrayList<Row> rows_ = new ArrayList<Row>(this.rows);
+    rows_.add(0, number_row.updateWidth(keysWidth));
+    return new KeyboardData(rows_, keysWidth);
  }

  public Key findKeyWithValue(KeyValue kv)
@@ -112,7 +114,6 @@ class KeyboardData
  public static Row bottom_row;
  public static Row number_row;
  public static KeyboardData num_pad;
-  public static KeyboardData pin_entry;
  private static Map<Integer, KeyboardData> _layoutCache = new HashMap<Integer, KeyboardData>();

  public static void init(Resources res)
@@ -129,13 +130,6 @@ class KeyboardData
    }
  }

-  public static KeyboardData load_pin_entry(Resources res)
-  {
-    if (pin_entry == null)
-      pin_entry = load(res, R.xml.pin);
-    return pin_entry;
-  }
-
  /** Load a layout from a resource ID. Returns [null] on error. */
  public static KeyboardData load(Resources res, int id)
  {
@@ -277,206 +271,129 @@ class KeyboardData

  public static class Key
  {
-    /*
-     ** 1   2
-     **   0
-     ** 3   4
+    /**
+     *  1 7 2
+     *  5 0 6
+     *  3 8 4
     */
-    public final Corner key0;
-    public final Corner key1;
-    public final Corner key2;
-    public final Corner key3;
-    public final Corner key4;
-
+    public final KeyValue[] keys;
+    /** Pack flags for every key values. Flags are: [F_LOC]. */
+    private final int keysflags;
    /** Key width in relative unit. */
    public final float width;
    /** 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;
    /** Keys 2 and 3 are repeated as the finger moves laterally on the key.
        Used for the left and right arrow keys on the space bar. */
    public final boolean slider;
    /** String printed on the keys. It has no other effect. */
    public final String indication;

-    protected Key(Corner k0, Corner k1, Corner k2, Corner k3, Corner k4, float w, float s, boolean e, boolean sl, String i)
+    /** Whether a key was declared with the 'loc' prefix. */
+    public static final int F_LOC = 1;
+    public static final int ALL_FLAGS = F_LOC;
+
+    protected Key(KeyValue[] ks, int f, float w, float s, boolean sl, String i)
    {
-      key0 = k0;
-      key1 = k1;
-      key2 = k2;
-      key3 = k3;
-      key4 = k4;
+      keys = ks;
+      keysflags = f;
      width = w;
      shift = s;
-      edgekeys = e;
      slider = sl;
      indication = i;
    }

+    /** Write the parsed key into [ks] at [index]. Doesn't write if the
+        attribute is not present. Return flags that can be aggregated into the
+        value for [keysflags]. */
+    static int parse_key_attr(XmlPullParser parser, String attr, KeyValue[] ks,
+        int index)
+        throws Exception
+    {
+      String name = parser.getAttributeValue(null, attr);
+      int flags = 0;
+      if (name == null)
+        return 0;
+      String name_loc = stripPrefix(name, "loc ");
+      if (name_loc != null)
+      {
+        flags |= F_LOC;
+        name = name_loc;
+      }
+      ks[index] = KeyValue.getKeyByName(name);
+      return (flags << index);
+    }
+
+    static String stripPrefix(String s, String prefix)
+    {
+      return s.startsWith(prefix) ? s.substring(prefix.length()) : null;
+    }
+
    public static Key parse(XmlPullParser parser) throws Exception
    {
-      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");
+      KeyValue[] ks = new KeyValue[9];
+      int keysflags = 0;
+      keysflags |= parse_key_attr(parser, "key0", ks, 0);
+      keysflags |= parse_key_attr(parser, "key1", ks, 1);
+      keysflags |= parse_key_attr(parser, "key2", ks, 2);
+      keysflags |= parse_key_attr(parser, "key3", ks, 3);
+      keysflags |= parse_key_attr(parser, "key4", ks, 4);
+      keysflags |= parse_key_attr(parser, "key5", ks, 5);
+      keysflags |= parse_key_attr(parser, "key6", ks, 6);
+      keysflags |= parse_key_attr(parser, "key7", ks, 7);
+      keysflags |= parse_key_attr(parser, "key8", ks, 8);
      float width = attribute_float(parser, "width", 1f);
      float shift = attribute_float(parser, "shift", 0.f);
-      boolean edgekeys = attribute_bool(parser, "edgekeys", false);
      boolean slider = attribute_bool(parser, "slider", false);
      String indication = parser.getAttributeValue(null, "indication");
      while (parser.next() != XmlPullParser.END_TAG)
-        continue ;
-      return new Key(k0, k1, k2, k3, k4, width, shift, edgekeys, slider, indication);
+        continue;
+      return new Key(ks, keysflags, width, shift, slider, indication);
+    }
+
+    /** Whether key at [index] as [flag]. */
+    public boolean keyHasFlag(int index, int flag)
+    {
+      return (keysflags & (flag << index)) != 0;
    }

    /** New key with the width multiplied by 's'. */
    public Key scaleWidth(float s)
    {
-      return new Key(key0, key1, key2, key3, key4, width * s, shift, edgekeys,
-          slider, indication);
+      return new Key(keys, keysflags, width * s, shift, slider, indication);
    }

    public void getKeys(Set<KeyValue> dst)
    {
-      getCorner(dst, key0);
-      getCorner(dst, key1);
-      getCorner(dst, key2);
-      getCorner(dst, key3);
-      getCorner(dst, key4);
+      for (int i = 0; i < keys.length; i++)
+        if (keys[i] != null)
+          dst.add(keys[i]);
    }

-    void getCorner(Set<KeyValue> dst, Corner k) { if (k != null) dst.add(k.kv); }
-
    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;
+      return keys[i];
    }

    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, slider,
-          indication);
+      KeyValue[] ks = Arrays.copyOf(keys, keys.length);
+      ks[i] = kv;
+      int flags = (keysflags & ~(ALL_FLAGS << i));
+      return new Key(ks, flags, width, shift, slider, indication);
    }

    public Key withShift(float s)
    {
-      return new Key(key0, key1, key2, key3, key4, width, s, edgekeys, slider,
-          indication);
-    }
-
-    /**
-     * 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;
+      return new Key(keys, keysflags, width, s, slider, indication);
    }

    public boolean hasValue(KeyValue kv)
    {
-      return (hasValue(key0, kv) || hasValue(key1, kv) || hasValue(key2, kv) ||
-          hasValue(key3, kv) || hasValue(key4, kv));
-    }
-
-    private static boolean hasValue(Corner c, KeyValue kv)
-    {
-      return (c != null && c.kv.equals(kv));
-    }
-  }
-
-  public static final class Corner
-  {
-    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;
-
-    protected Corner(KeyValue k, boolean l)
-    {
-      kv = k;
-      localized = l;
-    }
-
-    public static Corner parse_of_attr(XmlPullParser 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;
+      for (int i = 0; i < keys.length; i++)
+        if (keys[i] != null && keys[i].equals(kv))
+          return true;
+      return false;
    }
  }

@@ -490,17 +407,11 @@ class KeyboardData

    public Key apply(Key k)
    {
-      return new Key(apply(k.key0), apply(k.key1), apply(k.key2),
-          apply(k.key3), apply(k.key4), k.width, k.shift, k.edgekeys,
-          k.slider, k.indication);
-    }
-
-    protected Corner apply(Corner c)
-    {
-      if (c == null)
-        return null;
-      KeyValue kv = apply(c.kv, c.localized);
-      return (kv == null) ? null : new Corner(kv, c.localized);
+      KeyValue[] ks = new KeyValue[k.keys.length];
+      for (int i = 0; i < ks.length; i++)
+        if (k.keys[i] != null)
+          ks[i] = apply(k.keys[i], k.keyHasFlag(i, Key.F_LOC));
+      return new Key(ks, k.keysflags, k.width, k.shift, k.slider, k.indication);
    }
  }

@@ -0,0 +1,55 @@
+package juloo.keyboard2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build.VERSION;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class LauncherActivity extends Activity
+{
+  /** Text is replaced when receiving key events. */
+  TextView _tryhere_text;
+  EditText _tryhere_area;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.launcher_activity);
+    _tryhere_text = (TextView)findViewById(R.id.launcher_tryhere_text);
+    _tryhere_area = (EditText)findViewById(R.id.launcher_tryhere_area);
+    if (VERSION.SDK_INT > 28)
+      _tryhere_area.addOnUnhandledKeyEventListener(
+          this.new Tryhere_OnUnhandledKeyEventListener());
+  }
+
+  public void launch_imesettings(View _btn)
+  {
+    startActivity(new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS));
+  }
+
+  final class Tryhere_OnUnhandledKeyEventListener implements View.OnUnhandledKeyEventListener
+  {
+    public boolean onUnhandledKeyEvent(View v, KeyEvent ev)
+    {
+      // Key release of modifiers would erase interesting data
+      if (KeyEvent.isModifierKey(ev.getKeyCode()))
+        return false;
+      StringBuilder s = new StringBuilder();
+      if (ev.isAltPressed()) s.append("Alt+");
+      if (ev.isShiftPressed()) s.append("Shift+");
+      if (ev.isCtrlPressed()) s.append("Ctrl+");
+      if (ev.isMetaPressed()) s.append("Meta+");
+      // s.append(ev.getDisplayLabel());
+      String kc = KeyEvent.keyCodeToString(ev.getKeyCode());
+      s.append(kc.replaceFirst("^KEYCODE_", ""));
+      _tryhere_text.setText(s.toString());
+      return true;
+    }
+  }
+}
@@ -76,12 +76,20 @@ public final class Pointers implements Handler.Callback
    return -1;
  }

+  public int getKeyFlags(KeyboardData.Key key, KeyValue kv)
+  {
+    Pointer ptr = getLatched(key, kv);
+    if (ptr == null) return -1;
+    return ptr.flags;
+  }
+
  /** Fake pointers are latched and not lockable. */
  public void add_fake_pointer(KeyValue kv, KeyboardData.Key key, boolean locked)
  {
-    if (getLatched(key, kv) != null)
-      return; // Already latched, don't add an other pointer.
-    Pointer ptr = new Pointer(-1, key, kv, 0.f, 0.f, Modifiers.EMPTY);
+    Pointer ptr = getLatched(key, kv);
+    if (ptr != null)
+      removePtr(ptr); // Already latched, replace pointer.
+    ptr = new Pointer(-1, key, kv, 0.f, 0.f, Modifiers.EMPTY);
    ptr.flags &= ~(KeyValue.FLAG_LATCH | KeyValue.FLAG_LOCK);
    ptr.flags |= KeyValue.FLAG_FAKE_PTR;
    if (locked)
@@ -105,6 +113,7 @@ public final class Pointers implements Handler.Callback
      return;
    if (ptr.sliding)
    {
+      clearLatched();
      onTouchUp_sliding(ptr);
      return;
    }
@@ -159,45 +168,52 @@ public final class Pointers implements Handler.Callback
    // 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);
+    KeyValue value = _handler.modifyKey(key.keys[0], mods);
    Pointer ptr = new Pointer(pointerId, key, value, x, y, mods);
    _ptrs.add(ptr);
    startKeyRepeat(ptr);
    _handler.onPointerDown(false);
  }

+  static final int[] DIRECTION_TO_INDEX = new int[]{
+    7, 2, 2, 6, 6, 4, 4, 8, 8, 3, 3, 5, 5, 1, 1, 7
+  };
+
+  /**
+   * [direction] is an int between [0] and [15] that represent 16 sections of a
+   * circle, clockwise, starting at the top.
+   */
+  KeyValue getKeyAtDirection(KeyboardData.Key k, int direction)
+  {
+    return k.keys[DIRECTION_TO_INDEX[direction]];
+  }
+
  /*
-   * Get the KeyValue at the given direction. In case of swipe (!= 0), get the
-   * nearest KeyValue that is not key0.
+   * Get the KeyValue at the given direction. In case of swipe (direction !=
+   * null), 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)
+  private KeyValue getNearestKeyAtDirection(Pointer ptr, Integer direction)
  {
-    if (direction == 0)
-      return handleKV(ptr.key.key0, ptr.modifiers);
+    if (direction == null)
+      return _handler.modifyKey(ptr.key.keys[0], ptr.modifiers);
    KeyValue k;
-    for (int i = 0; i > -3; i = (~i>>31) - i)
+    // [i] is [0, -1, 1, -2, 2, ...]
+    for (int i = 0; i > -4; i = (~i>>31) - i)
    {
-      int d = (direction + i + 8 - 1) % 8 + 1;
+      int d = (direction + i + 16) % 16;
      // 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);
+      k = _handler.modifyKey(getKeyAtDirection(ptr.key, 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);
@@ -217,45 +233,35 @@ public final class Pointers implements Handler.Callback
    }

    float dist = Math.abs(dx) + Math.abs(dy);
-    int direction;
+    Integer direction;
    if (dist < _config.swipe_dist_px)
    {
-      direction = 0;
+      direction = null;
    }
    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;
+      // See [getKeyAtDirection()] for the meaning. The starting point on the
+      // circle is the top direction.
+      double a = Math.atan2(dy, dx) + Math.PI;
+      // a is between 0 and 2pi, 0 is pointing to the left
+      // add 12 to align 0 to the top
+      direction = ((int)(a * 8 / Math.PI) + 12) % 16;
    }

    if (direction != ptr.selected_direction)
    {
      ptr.selected_direction = direction;
-      KeyValue newValue = getKeyAtDirection(ptr, direction);
-      if (newValue != null && (ptr.value == null || !newValue.equals(ptr.value)))
+      KeyValue newValue = getNearestKeyAtDirection(ptr, direction);
+      if (newValue != null && !newValue.equals(ptr.value))
      {
        ptr.value = newValue;
        ptr.flags = newValue.getFlags();
-        // Sliding mode is entered when key2 or key3 is down on a slider key.
-        if (ptr.key.slider)
+        // Sliding mode is entered when key5 or key6 is down on a slider key.
+        if (ptr.key.slider &&
+            (newValue.equals(ptr.key.getKeyValue(5))
+             || newValue.equals(ptr.key.getKeyValue(6))))
        {
-          switch (direction)
-          {
-            case 1:
-            case 8:
-            case 4:
-            case 5:
-              startSliding(ptr, dy);
-              break;
-          }
+          startSliding(ptr, dy);
        }
        _handler.onPointerDown(true);
      }
@@ -411,9 +417,8 @@ public final class Pointers implements Handler.Callback
    int count = (int)(dx / _config.slide_step_px);
    if (count == ptr.sliding_count)
      return;
-    KeyValue newValue = handleKV(
-        (count < ptr.sliding_count) ? ptr.key.key3 : ptr.key.key2,
-        ptr.modifiers);
+    int key_index = (count < ptr.sliding_count) ? 5 : 6;
+    KeyValue newValue = _handler.modifyKey(ptr.key.keys[key_index], ptr.modifiers);
    ptr.sliding_count = count;
    ptr.value = newValue;
    if (newValue != null)
@@ -426,8 +431,8 @@ public final class Pointers implements Handler.Callback
    public int pointerId;
    /** The Key pressed by this Pointer */
    public final KeyboardData.Key key;
-    /** Current direction. */
-    public int selected_direction;
+    /** Current direction. [null] means not swiping. */
+    public Integer selected_direction;
    /** Selected value with [modifiers] applied. */
    public KeyValue value;
    public float downX;
@@ -447,7 +452,7 @@ public final class Pointers implements Handler.Callback
    {
      pointerId = p;
      key = k;
-      selected_direction = 0;
+      selected_direction = null;
      value = v;
      downX = x;
      downY = y;
@@ -9,27 +9,24 @@ import glob
 # The baseline is 'values/strings.xml', which is english.

 def parse_strings_file(file):
-    resources = ET.parse(file).getroot()
-    return [
-        ((ent.get("name"), ent.get("product")), ent.text)
-        for ent in resources if ent.tag == "string"
-    ]
+    def key(ent): return ent.get("name"), ent.get("product")
+    resrcs = ET.parse(file).getroot()
+    return { key(ent): ent for ent in resrcs if ent.tag == "string" }

-def string_entry_str(name, text, product):
-    product_attr = ' product="%s"' % product if product != None else ""
-    text_encoded = saxutils.escape(text)
-    return '<string name="%s"%s>%s</string>' % (name, product_attr, text_encoded)
+def dump_entry(out, entry, comment):
+    out.write("  ")
+    if comment: out.write("<!-- ")
+    out.write(ET.tostring(entry, "unicode").strip())
+    if comment: out.write(" -->")
+    out.write("\n")

 def write_updated_strings(out, baseline, strings):
    out.write('<?xml version="1.0" encoding="utf-8"?>\n<resources>\n')
-    for key, default_text in baseline:
-        name, product = key
+    for key, baseline_entry in baseline.items():
        if key in strings:
-            ent = string_entry_str(name, strings[key], product)
-            out.write("  %s\n" % ent)
+            dump_entry(out, strings[key], False)
        else:
-            def_ent = string_entry_str(name, default_text, product)
-            out.write("  <!-- %s -->\n" % def_ent)
+            dump_entry(out, baseline_entry, True)
    out.write('</resources>\n')

 baseline = parse_strings_file("res/values/strings.xml")
Author	SHA1	Message	Date
Jules Aguillon	73737e5148	Release 1.22.1 Check translations / check-translations (push) Has been cancelled Details Make Apk CI / Build-Apk (push) Has been cancelled Details	2023-04-10 13:18:24 +02:00
Jules Aguillon	fc901bae9b	Launcher activity: Fix crash on API < 28	2023-04-10 13:15:59 +02:00
doak	d4be979696	Do not lock modifiers if sliding a key This unconditionally removes all pointers (touches) pressing modifiers which are not already locked, avoiding that the (currently) latched modifier will be locked aventually. This can be verfified while sliding the space bar to move the cursor left or right. Closes #319.	2023-04-10 13:14:50 +02:00
Jules Aguillon	1aaf427883	Release 1.22.0 Check translations / check-translations (push) Has been cancelled Details Make Apk CI / Build-Apk (push) Has been cancelled Details	2023-04-02 17:27:44 +02:00
Jules Aguillon	a662934afc	Bump targetSdkVersion to 33 No change needed.	2023-04-02 17:16:56 +02:00
Jules Aguillon	351355b3a7	Launcher activity: Input box For trying the keyboard without having to mess with an other app.	2023-04-02 13:29:53 +02:00
Jules Aguillon	3caca59ff4	Refactor: Remove unecessary method KeyboardData.load_pin_entry	2023-03-28 11:55:24 +02:00
Jules Aguillon	35b4e442ab	Add a launchable explanatory activity This activity points to the system settings page for enabling input methods. This is purely a shortcut but is expected by many users. It could be made more useful in the future or hidden whenever the keyboard is enabled.	2023-03-28 11:22:17 +02:00
Jules Aguillon	c4de1ec267	sync_translations.py: Output sub-elements	2023-03-28 11:11:41 +02:00
Chasm Solacer	59b0b60f3f	Updated pl (Polish) translation (#316 )	2023-03-24 01:26:14 +01:00
Jules Aguillon	2f938dc6f4	Correct pointer direction The previous algorithm did not cut the circle into 16 equal parts. The division by 2pi yielded numbers smaller than 16, which no longer made sense after the cast to int.	2023-03-13 03:06:43 +01:00
Mostafa Ayesh	ce51df6f5a	Add Arabic layout (#314 ) * add arabic keyboard * use unicode values for special characters * add alternate layout * use arabic numbers	2023-03-11 16:54:20 +01:00
Luke Videckis	6aaa497393	New Hindi layout (#313 ) * New Hindi layout * Update default layout for Marathi, Nepali * Consistent naming for Devanagari layouts	2023-03-11 16:43:17 +01:00
Jules Aguillon	bac228e6fb	Add extra keys for Ukrainian	2023-03-05 23:36:15 +01:00
Jules Aguillon	d7e4840f4d	Add support for Belarusian It uses the russian layout with placed extra keys.	2023-03-05 23:34:26 +01:00
Jules Aguillon	18d3fd3c84	Refactor: Remove KeyboardData.Corner The Corner class is removed. The "localized" flag for all the corners is held in a bitfield.	2023-03-05 23:08:35 +01:00
Jules Aguillon	c56ad425f6	Remove the 'edgekeys' attribute	2023-03-05 20:08:56 +01:00
Jules Aguillon	a6fe5cae00	Allow 8 symbols per key 'Keyboard.Key' now contains an array of size 9, giving each keyvalue an index. The algorithm for finding the nearest key during a swipe now needs 16 segments, which are now calculated as an angle. The algorithm does one more interation instead of 2 more, slightly reducing the sensitivity of corner values. The 'getAtDirection' function is moved into the Pointers class to clearly separate the two systems. The 'edgekey' attribute is now obsolete but is kept for compatibility. The flag is removed internally, key index are simply translated. Similarly, the 'slider' attribute now act on keys at index 5 and 6 instead of 2 and 3.	2023-03-03 19:44:05 +01:00
Jules Aguillon	1f9e92ed60	Fix caps lock stopped by auto-capitalisation Auto-capitalisation triggers when the backspace key is used. Make sure to not remove a locked shift pointer.	2023-03-02 11:40:22 +01:00
Jules Aguillon	0da02d60c4	Do not remove numpad keys from the layout This removes keys like '.' and '-' from their usual place, which is pretty annoying. The feature is retained for the number row.	2023-03-02 10:57:58 +01:00
Edgars	70754aa3eb	Update LV translation	2023-03-02 10:41:46 +01:00
Jules Aguillon	2244c46af1	Allow key and keyboard opacity to be 0	2023-02-26 11:52:10 +01:00
Jules Aguillon	798494e701	Fix miscalculated keyboard height with number row The 'keysHeight' field needs to be updated. As this class is not intended to be mutable, copy the list of rows and call the constructor. Also remove an unecessary component of the keyboard height calculation.	2023-02-26 11:31:08 +01:00
mscheidemann	0d902aa334	Update values-de/strings.xml (#295 ) Missing German translation completed	2023-02-26 09:54:47 +01:00
Jules Aguillon	91f27a1432	Update translations Outdated since `0f62b30`	2023-02-26 09:49:06 +01:00
JackDotJS	9523b158b3	Add theme "Alternative Black" (#297 ) * Add alternative black theme	2023-02-26 09:47:31 +01:00