abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-cs/strings.xml1
-rw-r--r--res/values-de/strings.xml1
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-fa/strings.xml1
-rw-r--r--res/values-fr/strings.xml1
-rw-r--r--res/values-it/strings.xml1
-rw-r--r--res/values-ko/strings.xml1
-rw-r--r--res/values-lv/strings.xml1
-rw-r--r--res/values-pl/strings.xml1
-rw-r--r--res/values-pt/strings.xml1
-rw-r--r--res/values-ro/strings.xml1
-rw-r--r--res/values-ru/strings.xml1
-rw-r--r--res/values-tr/strings.xml1
-rw-r--r--res/values-uk/strings.xml1
-rw-r--r--res/values-vi/strings.xml1
-rw-r--r--res/values-zh-rCN/strings.xml1
-rw-r--r--res/values/strings.xml1
-rw-r--r--res/xml/bottom_row.xml2
-rw-r--r--res/xml/greekmath.xml2
-rw-r--r--res/xml/numeric.xml2
-rw-r--r--srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java25
21 files changed, 34 insertions, 14 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 771053b..199f97d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -102,6 +102,7 @@ Nezapomeňte... Jako každá virtuální klávesnice, i tato musí být aktivov
<string name="launcher_tryhere">Po aktivaci můžete klávesnici rovnou vyzkoušet zde:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Caps lock</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Řecké a matematické symboly</string>
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<string name="key_descr_voice_typing">Hlasové zadávání</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 84f3e26..5fbdd85 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -90,6 +90,7 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
<string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Feststelltaste</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Griechische &amp; mathematische Symbole</string>
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<string name="key_descr_voice_typing">Spracheingabe</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e58048d..b520178 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -90,6 +90,7 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
<string name="launcher_tryhere">Tras habilitarlo, puedes probar el teclado en este campo:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Bloq Mayús</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Símb. griegos y matemáticos</string>
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<string name="key_descr_voice_typing">Dictado por voz</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1cbc7c7..76e8db1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
<string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 971fef9..4450819 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -90,6 +90,7 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
<string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Verrouillage majuscules</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Symboles mathématiques</string>
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<string name="key_descr_voice_typing">Saisie vocale</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b6a278d..414adf9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
<!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 06ee380..81812b8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -102,6 +102,7 @@
<!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fc32013..ac8c357 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -92,6 +92,7 @@ Tagad lieliski piemērota izmantošanai ikdienā.
<string name="launcher_tryhere">Pēc iespējošanas šeit var izmēģināt tastatūru:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Burtslēgs</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Grieķu un matemātikas rakstzīmes</string>
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<string name="key_descr_voice_typing">Rakstīšana ar balsi</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aa983b4..343fbb3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -90,6 +90,7 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
<string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Caps lock</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Symbole greckie i matematyczne</string>
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<string name="key_descr_voice_typing">Pisanie głosowe</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7a603f6..26ecc08 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -102,6 +102,7 @@ Sistema &gt; Idioma e entrada &gt; Teclado virtual &gt; Gerenciar teclados virtu
<string name="launcher_tryhere">Após ativar, experimente aqui:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Caps lock</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Grego &amp; símbolos matemáticos</string>
<string name="key_descr_change_method">Trocar de teclado</string>
<string name="key_descr_voice_typing">Digitação por voz</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f4b814b..5e4d358 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -90,6 +90,7 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
<string name="launcher_tryhere">După activare, puteți să încercați tastatura aici:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a2defba..b7875d5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -90,6 +90,7 @@
<string name="launcher_tryhere">После активации вы можете попробовать клавиатуру прямо здесь:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0dc19f9..da03673 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -90,6 +90,7 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
<string name="launcher_tryhere">Ayarlardan aktif ettikten sonra klavyeyi burada test edebilirsin:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">CapsLock</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Greek &amp; math sembolleri</string>
<string name="key_descr_change_method">Klavye değiştir</string>
<string name="key_descr_voice_typing">Sesle yazma</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index eb7f4c4..efbc3a8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
<string name="launcher_tryhere">Після ввімкнення ви можете спробувати клавіатуру тут:</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<string name="key_descr_capslock">Caps lock</string>
+ <!-- <string name="key_descr_compose">Compose</string> -->
<string name="key_descr_switch_greekmath">Грецькі та математичні символи</string>
<string name="key_descr_change_method">Переключити клавіатуру</string>
<string name="key_descr_voice_typing">Голосове введення</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fc028b1..e81ec1f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -90,6 +90,7 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
<!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e2c8415..50c63bc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
<string name="launcher_tryhere">启用键盘后，可以在这里测试效果：</string>
<!-- <string name="launcher_tryhere_hint">Try here</string> -->
<!-- <string name="key_descr_capslock">Caps lock</string> -->
+ <!-- <string name="key_descr_compose">Compose</string> -->
<!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
<!-- <string name="key_descr_change_method">Switch keyboard</string> -->
<!-- <string name="key_descr_voice_typing">Voice typing</string> -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e334706..d518b59 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open
<string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
<string name="launcher_tryhere_hint">Try here</string>
<string name="key_descr_capslock">Caps lock</string>
+ <string name="key_descr_compose">Compose</string>
<string name="key_descr_switch_greekmath">Greek &amp; math symbols</string>
<string name="key_descr_change_method">Switch keyboard</string>
<string name="key_descr_voice_typing">Voice typing</string>
diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
index d0562d1..2f4de2b 100644
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -3,6 +3,6 @@
<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="loc change_method" key3="switch_emoji" key4="config"/>
<key width="4.4" key0="space" key7="switch_forward" key8="switch_backward" key5="cursor_left" key6="cursor_right" slider="true"/>
- <key width="1.1" key0="compose" key7="up" key6="right" key5="left" key8="down" key1="loc home" key2="loc page_up" key3="loc end" key4="loc page_down"/>
+ <key width="1.1" key0="loc compose" key7="up" key6="right" key5="left" key8="down" key1="loc home" key2="loc page_up" key3="loc end" key4="loc page_down"/>
<key width="1.7" key0="enter" key1="loc voice_typing" key2="action"/>
</row>
diff --git a/res/xml/greekmath.xml b/res/xml/greekmath.xml
index b655b50..4821840 100644
--- a/res/xml/greekmath.xml
+++ b/res/xml/greekmath.xml
@@ -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" key0="compose" key7="up" key6="right" key5="left" key8="down"/>
+ <key width="1.2" key0="loc compose" key7="up" key6="right" key5="left" key8="down"/>
<key width="1.2" key0="enter" key1="=" key2="action"/>
</row>
</keyboard>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index 82f52e8..ca4eeb9 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -30,7 +30,7 @@
<key width="1.5" key0="switch_text" key2="ctrl"/>
<key width="1.5" key0="0" key3="f11_placeholder" key4="f12_placeholder"/>
<key width="0.75" key0="." key1=":" key2="," key3=";"/>
- <key width="0.75" key0="space" key1="&quot;" key2="'" key3="compose" key4="_"/>
+ <key width="0.75" key0="space" key1="&quot;" key2="'" key3="loc compose" key4="_"/>
<key width="1.5" key0="enter" key1="±" key2="action" key3="="/>
</row>
</keyboard>
diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
index 6802d97..c15dff3 100644
--- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
@@ -22,6 +22,7 @@ public class ExtraKeysPreference extends PreferenceCategory
{
"alt",
"meta",
+ "compose",
"voice_typing",
"accent_aigu",
"accent_grave",
@@ -74,6 +75,7 @@ public class ExtraKeysPreference extends PreferenceCategory
{
case "voice_typing":
case "change_method":
+ case "compose":
return true;
default:
return false;
@@ -87,25 +89,26 @@ public class ExtraKeysPreference extends PreferenceCategory
switch (name)
{
case "capslock": id = R.string.key_descr_capslock; break;
- case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break;
case "change_method": id = R.string.key_descr_change_method; break;
- case "voice_typing": id = R.string.key_descr_voice_typing; break;
+ case "compose": id = R.string.key_descr_compose; break;
case "copy": id = R.string.key_descr_copy; break;
- case "paste": id = R.string.key_descr_paste; break;
case "cut": id = R.string.key_descr_cut; break;
+ case "end": id = R.string.key_descr_end; break;
+ case "home": id = R.string.key_descr_home; break;
+ case "page_down": id = R.string.key_descr_page_down; break;
+ case "page_up": id = R.string.key_descr_page_up; break;
+ case "paste": id = R.string.key_descr_paste; break;
+ case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break;
+ case "redo": id = R.string.key_descr_redo; break;
case "selectAll": id = R.string.key_descr_selectAll; break;
case "shareText": id = R.string.key_descr_shareText; break;
- case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break;
+ case "subscript": id = R.string.key_descr_subscript; break;
+ case "superscript": id = R.string.key_descr_superscript; break;
+ case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break;
case "undo": id = R.string.key_descr_undo; break;
- case "redo": id = R.string.key_descr_redo; break;
+ case "voice_typing": id = R.string.key_descr_voice_typing; break;
case "ª": id = R.string.key_descr_ª; break;
case "º": id = R.string.key_descr_º; break;
- case "superscript": id = R.string.key_descr_superscript; break;
- case "subscript": id = R.string.key_descr_subscript; break;
- case "page_up": id = R.string.key_descr_page_up; break;
- case "page_down": id = R.string.key_descr_page_down; break;
- case "home": id = R.string.key_descr_home; break;
- case "end": id = R.string.key_descr_end; break;
}
if (id == 0)
return null;
generated by ps-cgit (a fork of cgit), using a theme by hackitude