diff --git a/check_layout.output b/check_layout.output index f08bf39..a1af606 100644 --- a/check_layout.output +++ b/check_layout.output @@ -1,57 +1,99 @@ -# res/xml/ar_alt.xml +# res/xml/arab_alt.xml Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~ 1 warnings -# res/xml/ar_pc.xml +# res/xml/arab_pc_ckb.xml +Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~ +1 warnings +# res/xml/arab_pc_ir.xml +Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~ +1 warnings +# res/xml/arab_pc.xml Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, | 1 warnings -# res/xml/azerty.xml -0 warnings -# res/xml/bengali_national.xml +# res/xml/beng_national.xml Layout includes some ASCII punctuation but not all, missing: $ Layout doesn't specify a script. 2 warnings -# res/xml/bengali_provat.xml +# res/xml/beng_provat.xml Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, } Layout doesn't specify a script. 2 warnings -# res/xml/bone.xml -Layout includes some ASCII punctuation but not all, missing: $ -1 warnings Not a layout file: res/xml/bottom_row.xml -# res/xml/colemak.xml +# res/xml/cyrl_jcuken_ru.xml 0 warnings -# res/xml/devanagari_1.xml -Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, | +# res/xml/cyrl_jcuken_uk.xml +0 warnings +# res/xml/cyrl_yaverti.xml +Layout includes some ASCII punctuation but not all, missing: ~ 1 warnings -# res/xml/devanagari_2.xml +# res/xml/deva_alt.xml Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, @, [, \, ], ^, _, `, {, |, }, ~ 1 warnings -# res/xml/dvorak.xml -0 warnings +# res/xml/deva_inscript.xml +Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, | +1 warnings # res/xml/greekmath.xml Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), *, +, ,, -, /, :, ;, <, >, ?, @, [, \, ], _, `, {, |, }, ~ Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, switch_emoji, switch_second Layout doesn't specify a script. 3 warnings -# res/xml/he_il_1452_1.xml -Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, } -1 warnings -# res/xml/he_il_1452_2.xml -Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, } -1 warnings -# res/xml/jcuken_ua.xml +# res/xml/grek_qwerty.xml 0 warnings -# res/xml/kurdish.xml -Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~ +# res/xml/hang_dubeolsik_kr.xml +0 warnings +# res/xml/hebr_1_il.xml +Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, } 1 warnings -# res/xml/local_bgph1.xml -Layout includes some ASCII punctuation but not all, missing: ~ +# res/xml/hebr_2_il.xml +Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, } 1 warnings -# res/xml/local_ru_jcuken.xml +# res/xml/latn_azerty_fr.xml +0 warnings +# res/xml/latn_bone.xml +Layout includes some ASCII punctuation but not all, missing: $ +1 warnings +# res/xml/latn_colemak.xml +0 warnings +# res/xml/latn_dvorak.xml +0 warnings +# res/xml/latn_neo2.xml +0 warnings +# res/xml/latn_qwerty_br.xml +0 warnings +# res/xml/latn_qwerty_es.xml +0 warnings +# res/xml/latn_qwerty_hu.xml +0 warnings +# res/xml/latn_qwerty_lv.xml +0 warnings +# res/xml/latn_qwerty_no.xml +0 warnings +# res/xml/latn_qwerty_pl.xml +0 warnings +# res/xml/latn_qwerty_ro.xml +0 warnings +# res/xml/latn_qwerty_se.xml +0 warnings +# res/xml/latn_qwerty_tr.xml +0 warnings +# res/xml/latn_qwerty_us.xml +0 warnings +# res/xml/latn_qwerty_vi.xml +Layout includes some ASCII punctuation but not all, missing: \ +1 warnings +# res/xml/latn_qwertz_cz.xml +Layout includes some ASCII punctuation but not all, missing: ` +1 warnings +# res/xml/latn_qwertz_de.xml +0 warnings +# res/xml/latn_qwertz_hu.xml +0 warnings +# res/xml/latn_qwertz_sk.xml +Layout includes some ASCII punctuation but not all, missing: \, ` +1 warnings +# res/xml/latn_qwertz.xml 0 warnings Not a layout file: res/xml/method.xml -# res/xml/neo2.xml -0 warnings Not a layout file: res/xml/number_row.xml # res/xml/numeric.xml Layout includes some ASCII punctuation but not all, missing: &, ?, @, ` @@ -64,51 +106,9 @@ Layout doesn't define some important keys, missing: backspace, delete Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_emoji, switch_numeric, switch_second, up Layout doesn't specify a script. 4 warnings -# res/xml/persian.xml -Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~ -1 warnings # res/xml/pin.xml Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, ~ Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_emoji, switch_second Layout doesn't specify a script. 3 warnings -# res/xml/qwerty_el.xml -0 warnings -# res/xml/qwerty_es.xml -0 warnings -# res/xml/qwerty_hu.xml -0 warnings -# res/xml/qwerty_ko.xml -0 warnings -# res/xml/qwerty_lv.xml -0 warnings -# res/xml/qwerty_no.xml -0 warnings -# res/xml/qwerty_pl.xml -0 warnings -# res/xml/qwerty_pt.xml -0 warnings -# res/xml/qwerty_ro.xml -0 warnings -# res/xml/qwerty_sv_se.xml -0 warnings -# res/xml/qwerty_tr.xml -0 warnings -# res/xml/qwerty_vi.xml -Layout includes some ASCII punctuation but not all, missing: \ -1 warnings -# res/xml/qwerty.xml -0 warnings -# res/xml/qwertz_cs.xml -Layout includes some ASCII punctuation but not all, missing: ` -1 warnings -# res/xml/qwertz_de.xml -0 warnings -# res/xml/qwertz_hu.xml -0 warnings -# res/xml/qwertz_sk.xml -Layout includes some ASCII punctuation but not all, missing: \, ` -1 warnings -# res/xml/qwertz.xml -0 warnings Not a layout file: res/xml/settings.xml diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 5f65927..713459d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -2,82 +2,82 @@ none - azerty - qwerty - qwerty_pt - qwerty_es - qwerty_ro - qwerty_el - qwerty_ko - qwerty_lv - qwerty_no - qwerty_sv_se - qwerty_hu - qwerty_tr - qwerty_pl - qwerty_vi - ru_jcuken - qwertz - qwertz_cs - qwertz_de - qwertz_hu - qwertz_sk - bgph1 - dvorak - colemak - neo2 - bone - jcuken_ua - bengali_national - bengali_provat - devanagari_1 - devanagari_2 - he_il_1452_1 - he_il_1452_2 - ar_pc - ar_alt - persian - kurdish + latn_qwerty_us + latn_colemak + latn_dvorak + arab_pc_ckb + arab_pc + arab_alt + arab_pc_ir + beng_national + beng_provat + cyrl_jcuken_ru + cyrl_jcuken_uk + cyrl_yaverti + deva_inscript + deva_alt + grek_qwerty + hang_dubeolsik_kr + hebr_1_il + hebr_2_il + latn_azerty_fr + latn_bone + latn_neo2 + latn_qwerty_hu + latn_qwerty_br + latn_qwerty_es + latn_qwerty_lv + latn_qwerty_no + latn_qwerty_pl + latn_qwerty_se + latn_qwerty_tr + latn_qwerty_vi + latn_qwerty_ro + latn_qwertz + latn_qwertz_cz + latn_qwertz_de + latn_qwertz_hu + latn_qwertz_sk custom None - AZERTY - QWERTY + QWERTY (US) + Colemak + Dvorak + Arabic (کوردی) + Arabic PC + Arabic Alt + Persian PC + বাংলা (জাতীয়) + বাংলা (প্রভাত) + ЙЦУКЕН (Русский) + ЙЦУКЕН (Українська) + ЯВЕРТЪ + देवनागरी (हिंदी)-1 + देवनागरी (हिंदी)-2 + QWERTY (Greek) + 두벌식 (Korean) + Hebrew 1 + Hebrew 2 + AZERTY (Français) + Bone + Neo 2 + QWERTY (Magyar) QWERTY (Brasileiro) QWERTY (Español) - QWERTY (Română) - QWERTY (Greek) - QWERTY (Korean) QWERTY (Latvian) QWERTY (Norwegian) - QWERTY (Swedish) - QWERTY (Hungarian) - QWERTY (Türkçe) QWERTY (Polski) + QWERTY (Swedish) + QWERTY (Türkçe) QWERTY (Vietnamese) - ЙЦУКЕН (Русский) + QWERTY (Română) QWERTZ QWERTZ (Czech) QWERTZ (Deutsch) - QWERTZ (Hungarian) + QWERTZ (Magyar) QWERTZ (Slovak) - Bulgarian (Phonetic Traditional) - Dvorak - Colemak - Neo 2 - Bone - ЙЦУКЕН (Українська) - বাংলা (জাতীয়) - বাংলা (প্রভাত) - देवनागरी (हिंदी)-1 - देवनागरी (हिंदी)-2 - Hebrew SI-1452-1 - Hebrew SI-1452-2 - Arabic PC - Arabic ALT - Persian - کوردی @string/pref_layout_e_custom diff --git a/res/xml/ar_alt.xml b/res/xml/arab_alt.xml similarity index 100% rename from res/xml/ar_alt.xml rename to res/xml/arab_alt.xml diff --git a/res/xml/ar_pc.xml b/res/xml/arab_pc.xml similarity index 100% rename from res/xml/ar_pc.xml rename to res/xml/arab_pc.xml diff --git a/res/xml/kurdish.xml b/res/xml/arab_pc_ckb.xml similarity index 100% rename from res/xml/kurdish.xml rename to res/xml/arab_pc_ckb.xml diff --git a/res/xml/persian.xml b/res/xml/arab_pc_ir.xml similarity index 96% rename from res/xml/persian.xml rename to res/xml/arab_pc_ir.xml index d6a4127..be2720c 100644 --- a/res/xml/persian.xml +++ b/res/xml/arab_pc_ir.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/bengali_national.xml b/res/xml/beng_national.xml similarity index 100% rename from res/xml/bengali_national.xml rename to res/xml/beng_national.xml diff --git a/res/xml/bengali_provat.xml b/res/xml/beng_provat.xml similarity index 100% rename from res/xml/bengali_provat.xml rename to res/xml/beng_provat.xml diff --git a/res/xml/local_ru_jcuken.xml b/res/xml/cyrl_jcuken_ru.xml similarity index 100% rename from res/xml/local_ru_jcuken.xml rename to res/xml/cyrl_jcuken_ru.xml diff --git a/res/xml/jcuken_ua.xml b/res/xml/cyrl_jcuken_uk.xml similarity index 100% rename from res/xml/jcuken_ua.xml rename to res/xml/cyrl_jcuken_uk.xml diff --git a/res/xml/local_bgph1.xml b/res/xml/cyrl_yaverti.xml similarity index 100% rename from res/xml/local_bgph1.xml rename to res/xml/cyrl_yaverti.xml diff --git a/res/xml/devanagari_2.xml b/res/xml/deva_alt.xml similarity index 100% rename from res/xml/devanagari_2.xml rename to res/xml/deva_alt.xml diff --git a/res/xml/devanagari_1.xml b/res/xml/deva_inscript.xml similarity index 100% rename from res/xml/devanagari_1.xml rename to res/xml/deva_inscript.xml diff --git a/res/xml/qwerty_el.xml b/res/xml/grek_qwerty.xml similarity index 100% rename from res/xml/qwerty_el.xml rename to res/xml/grek_qwerty.xml diff --git a/res/xml/qwerty_ko.xml b/res/xml/hang_dubeolsik_kr.xml similarity index 100% rename from res/xml/qwerty_ko.xml rename to res/xml/hang_dubeolsik_kr.xml diff --git a/res/xml/he_il_1452_1.xml b/res/xml/hebr_1_il.xml similarity index 97% rename from res/xml/he_il_1452_1.xml rename to res/xml/hebr_1_il.xml index ff1b961..50ba86e 100644 --- a/res/xml/he_il_1452_1.xml +++ b/res/xml/hebr_1_il.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/he_il_1452_2.xml b/res/xml/hebr_2_il.xml similarity index 97% rename from res/xml/he_il_1452_2.xml rename to res/xml/hebr_2_il.xml index ebd6d84..ff83a91 100644 --- a/res/xml/he_il_1452_2.xml +++ b/res/xml/hebr_2_il.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/azerty.xml b/res/xml/latn_azerty_fr.xml similarity index 94% rename from res/xml/azerty.xml rename to res/xml/latn_azerty_fr.xml index 88f3db6..8434466 100644 --- a/res/xml/azerty.xml +++ b/res/xml/latn_azerty_fr.xml @@ -1,4 +1,6 @@ + + diff --git a/res/xml/bone.xml b/res/xml/latn_bone.xml similarity index 97% rename from res/xml/bone.xml rename to res/xml/latn_bone.xml index 612290c..2f8a012 100644 --- a/res/xml/bone.xml +++ b/res/xml/latn_bone.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/colemak.xml b/res/xml/latn_colemak.xml similarity index 98% rename from res/xml/colemak.xml rename to res/xml/latn_colemak.xml index 4bac3ff..a7c78f2 100644 --- a/res/xml/colemak.xml +++ b/res/xml/latn_colemak.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/dvorak.xml b/res/xml/latn_dvorak.xml similarity index 100% rename from res/xml/dvorak.xml rename to res/xml/latn_dvorak.xml diff --git a/res/xml/neo2.xml b/res/xml/latn_neo2.xml similarity index 97% rename from res/xml/neo2.xml rename to res/xml/latn_neo2.xml index 14dbf20..6f20f38 100644 --- a/res/xml/neo2.xml +++ b/res/xml/latn_neo2.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/qwerty_pt.xml b/res/xml/latn_qwerty_br.xml similarity index 96% rename from res/xml/qwerty_pt.xml rename to res/xml/latn_qwerty_br.xml index 0c9015e..fda6f93 100644 --- a/res/xml/qwerty_pt.xml +++ b/res/xml/latn_qwerty_br.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/qwerty_es.xml b/res/xml/latn_qwerty_es.xml similarity index 100% rename from res/xml/qwerty_es.xml rename to res/xml/latn_qwerty_es.xml diff --git a/res/xml/qwerty_hu.xml b/res/xml/latn_qwerty_hu.xml similarity index 100% rename from res/xml/qwerty_hu.xml rename to res/xml/latn_qwerty_hu.xml diff --git a/res/xml/qwerty_lv.xml b/res/xml/latn_qwerty_lv.xml similarity index 100% rename from res/xml/qwerty_lv.xml rename to res/xml/latn_qwerty_lv.xml diff --git a/res/xml/qwerty_no.xml b/res/xml/latn_qwerty_no.xml similarity index 100% rename from res/xml/qwerty_no.xml rename to res/xml/latn_qwerty_no.xml diff --git a/res/xml/qwerty_pl.xml b/res/xml/latn_qwerty_pl.xml similarity index 100% rename from res/xml/qwerty_pl.xml rename to res/xml/latn_qwerty_pl.xml diff --git a/res/xml/qwerty_ro.xml b/res/xml/latn_qwerty_ro.xml similarity index 100% rename from res/xml/qwerty_ro.xml rename to res/xml/latn_qwerty_ro.xml diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/latn_qwerty_se.xml similarity index 100% rename from res/xml/qwerty_sv_se.xml rename to res/xml/latn_qwerty_se.xml diff --git a/res/xml/qwerty_tr.xml b/res/xml/latn_qwerty_tr.xml similarity index 100% rename from res/xml/qwerty_tr.xml rename to res/xml/latn_qwerty_tr.xml diff --git a/res/xml/qwerty.xml b/res/xml/latn_qwerty_us.xml similarity index 100% rename from res/xml/qwerty.xml rename to res/xml/latn_qwerty_us.xml diff --git a/res/xml/qwerty_vi.xml b/res/xml/latn_qwerty_vi.xml similarity index 97% rename from res/xml/qwerty_vi.xml rename to res/xml/latn_qwerty_vi.xml index 1e3a64a..8b51299 100644 --- a/res/xml/qwerty_vi.xml +++ b/res/xml/latn_qwerty_vi.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/qwertz.xml b/res/xml/latn_qwertz.xml similarity index 100% rename from res/xml/qwertz.xml rename to res/xml/latn_qwertz.xml diff --git a/res/xml/qwertz_cs.xml b/res/xml/latn_qwertz_cz.xml similarity index 100% rename from res/xml/qwertz_cs.xml rename to res/xml/latn_qwertz_cz.xml diff --git a/res/xml/qwertz_de.xml b/res/xml/latn_qwertz_de.xml similarity index 96% rename from res/xml/qwertz_de.xml rename to res/xml/latn_qwertz_de.xml index 6d01610..906c4fc 100644 --- a/res/xml/qwertz_de.xml +++ b/res/xml/latn_qwertz_de.xml @@ -1,4 +1,5 @@ + diff --git a/res/xml/qwertz_hu.xml b/res/xml/latn_qwertz_hu.xml similarity index 100% rename from res/xml/qwertz_hu.xml rename to res/xml/latn_qwertz_hu.xml diff --git a/res/xml/qwertz_sk.xml b/res/xml/latn_qwertz_sk.xml similarity index 100% rename from res/xml/qwertz_sk.xml rename to res/xml/latn_qwertz_sk.xml diff --git a/res/xml/method.xml b/res/xml/method.xml index 68a002a..2d5dc4a 100644 --- a/res/xml/method.xml +++ b/res/xml/method.xml @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 68fd81b..ddcd587 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -342,42 +342,42 @@ final class Config int id; switch (name) { - case "azerty": id = R.xml.azerty; break; - case "bengali_national": id = R.xml.bengali_national; break; - case "bengali_provat": id = R.xml.bengali_provat; break; - case "bgph1": id = R.xml.local_bgph1; break; - case "bone": id = R.xml.bone; break; - case "colemak": id = R.xml.colemak; break; - case "dvorak": id = R.xml.dvorak; 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; - case "qwerty_el": id = R.xml.qwerty_el; break; - case "qwerty_es": id = R.xml.qwerty_es; break; - case "qwerty_ro": id = R.xml.qwerty_ro; break; - case "qwerty_hu": id = R.xml.qwerty_hu; break; - case "qwerty_ko": id = R.xml.qwerty_ko; break; - case "qwerty_lv": id = R.xml.qwerty_lv; break; - case "qwerty_no": id = R.xml.qwerty_no; break; - case "qwerty_pt": id = R.xml.qwerty_pt; break; - case "qwerty_sv_se": id = R.xml.qwerty_sv_se; break; - case "qwerty_tr": id = R.xml.qwerty_tr; break; - case "qwerty_pl": id = R.xml.qwerty_pl; break; - case "qwerty_vi": id = R.xml.qwerty_vi; break; - case "qwertz": id = R.xml.qwertz; break; - case "qwertz_cs": id = R.xml.qwertz_cs; break; - case "qwertz_de": id = R.xml.qwertz_de; break; - case "qwertz_hu": id = R.xml.qwertz_hu; break; - case "qwertz_sk": id = R.xml.qwertz_sk; break; - 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; - case "persian": id = R.xml.persian; break; - case "kurdish": id = R.xml.kurdish; break; + case "arab_pc_ckb": id = R.xml.arab_pc_ckb; break; + case "arab_pc_ir": id = R.xml.arab_pc_ir; break; + case "arab_pc": id = R.xml.arab_pc; break; + case "arab_alt": id = R.xml.arab_alt; break; + case "beng_national": id = R.xml.beng_national; break; + case "beng_provat": id = R.xml.beng_provat; break; + case "cyrl_jcuken_ru": id = R.xml.cyrl_jcuken_ru; break; + case "cyrl_jcuken_uk": id = R.xml.cyrl_jcuken_uk; break; + case "cyrl_yaverti": id = R.xml.cyrl_yaverti; break; + case "deva_inscript": id = R.xml.deva_inscript; break; + case "deva_alt": id = R.xml.deva_alt; break; + case "grek_qwerty": id = R.xml.grek_qwerty; break; + case "hang_dubeolsik_kr": id = R.xml.hang_dubeolsik_kr; break; + case "hebr_1_il": id = R.xml.hebr_1_il; break; + case "hebr_2_il": id = R.xml.hebr_2_il; break; + case "latn_azerty_fr": id = R.xml.latn_azerty_fr; break; + case "latn_bone": id = R.xml.latn_bone; break; + case "latn_colemak": id = R.xml.latn_colemak; break; + case "latn_dvorak": id = R.xml.latn_dvorak; break; + case "latn_neo2": id = R.xml.latn_neo2; break; + case "latn_qwerty_hu": id = R.xml.latn_qwerty_hu; break; + case "latn_qwerty_br": id = R.xml.latn_qwerty_br; break; + case "latn_qwerty_es": id = R.xml.latn_qwerty_es; break; + case "latn_qwerty_lv": id = R.xml.latn_qwerty_lv; break; + case "latn_qwerty_no": id = R.xml.latn_qwerty_no; break; + case "latn_qwerty_pl": id = R.xml.latn_qwerty_pl; break; + case "latn_qwerty_ro": id = R.xml.latn_qwerty_ro; break; + case "latn_qwerty_se": id = R.xml.latn_qwerty_se; break; + case "latn_qwerty_tr": id = R.xml.latn_qwerty_tr; break; + case "latn_qwerty_us": id = R.xml.latn_qwerty_us; break; + case "latn_qwerty_vi": id = R.xml.latn_qwerty_vi; break; + case "latn_qwertz": id = R.xml.latn_qwertz; break; + case "latn_qwertz_cz": id = R.xml.latn_qwertz_cz; break; + case "latn_qwertz_de": id = R.xml.latn_qwertz_de; break; + case "latn_qwertz_hu": id = R.xml.latn_qwertz_hu; break; + case "latn_qwertz_sk": id = R.xml.latn_qwertz_sk; break; case "custom": return custom_layout; case "system": case "none": default: return null; } diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 8a5c69b..4b82c33 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -158,7 +158,7 @@ public class Keyboard2 extends InputMethodService } } if (default_layout == null) - default_layout = KeyboardData.load(getResources(), R.xml.qwerty); + default_layout = KeyboardData.load(getResources(), R.xml.latn_qwerty_us); _localeTextLayout = default_layout; if (_config.second_layout == null) {