From f36864533c33f8f1986db150987e354c59c7482b Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 25 Jun 2023 13:40:20 +0200 Subject: Standard layout names (#386) The names are comprised of: script, layout name, country code. Co-authored-by: grim --- check_layout.output | 130 ++++++++++++++++++------------------ res/values/arrays.xml | 122 ++++++++++++++++----------------- res/xml/ar_alt.xml | 42 ------------ res/xml/ar_pc.xml | 44 ------------ res/xml/arab_alt.xml | 42 ++++++++++++ res/xml/arab_pc.xml | 44 ++++++++++++ res/xml/arab_pc_ckb.xml | 39 +++++++++++ res/xml/arab_pc_ir.xml | 43 ++++++++++++ res/xml/azerty.xml | 37 ---------- res/xml/beng_national.xml | 37 ++++++++++ res/xml/beng_provat.xml | 37 ++++++++++ res/xml/bengali_national.xml | 37 ---------- res/xml/bengali_provat.xml | 37 ---------- res/xml/bone.xml | 45 ------------- res/xml/colemak.xml | 40 ----------- res/xml/cyrl_jcuken_ru.xml | 42 ++++++++++++ res/xml/cyrl_jcuken_uk.xml | 42 ++++++++++++ res/xml/cyrl_yaverti.xml | 37 ++++++++++ res/xml/deva_alt.xml | 30 +++++++++ res/xml/deva_inscript.xml | 37 ++++++++++ res/xml/devanagari_1.xml | 37 ---------- res/xml/devanagari_2.xml | 30 --------- res/xml/dvorak.xml | 37 ---------- res/xml/grek_qwerty.xml | 37 ++++++++++ res/xml/hang_dubeolsik_kr.xml | 37 ++++++++++ res/xml/he_il_1452_1.xml | 41 ------------ res/xml/he_il_1452_2.xml | 39 ----------- res/xml/hebr_1_il.xml | 42 ++++++++++++ res/xml/hebr_2_il.xml | 40 +++++++++++ res/xml/jcuken_ua.xml | 42 ------------ res/xml/kurdish.xml | 39 ----------- res/xml/latn_azerty_fr.xml | 39 +++++++++++ res/xml/latn_bone.xml | 46 +++++++++++++ res/xml/latn_colemak.xml | 41 ++++++++++++ res/xml/latn_dvorak.xml | 37 ++++++++++ res/xml/latn_neo2.xml | 50 ++++++++++++++ res/xml/latn_qwerty_br.xml | 39 +++++++++++ res/xml/latn_qwerty_es.xml | 38 +++++++++++ res/xml/latn_qwerty_hu.xml | 37 ++++++++++ res/xml/latn_qwerty_lv.xml | 37 ++++++++++ res/xml/latn_qwerty_no.xml | 37 ++++++++++ res/xml/latn_qwerty_pl.xml | 37 ++++++++++ res/xml/latn_qwerty_ro.xml | 37 ++++++++++ res/xml/latn_qwerty_se.xml | 41 ++++++++++++ res/xml/latn_qwerty_tr.xml | 37 ++++++++++ res/xml/latn_qwerty_us.xml | 58 ++++++++++++++++ res/xml/latn_qwerty_vi.xml | 38 +++++++++++ res/xml/latn_qwertz.xml | 37 ++++++++++ res/xml/latn_qwertz_cz.xml | 37 ++++++++++ res/xml/latn_qwertz_de.xml | 41 ++++++++++++ res/xml/latn_qwertz_hu.xml | 38 +++++++++++ res/xml/latn_qwertz_sk.xml | 39 +++++++++++ res/xml/local_bgph1.xml | 37 ---------- res/xml/local_ru_jcuken.xml | 42 ------------ res/xml/method.xml | 64 +++++++++--------- res/xml/neo2.xml | 49 -------------- res/xml/persian.xml | 42 ------------ res/xml/qwerty.xml | 58 ---------------- res/xml/qwerty_el.xml | 37 ---------- res/xml/qwerty_es.xml | 38 ----------- res/xml/qwerty_hu.xml | 37 ---------- res/xml/qwerty_ko.xml | 37 ---------- res/xml/qwerty_lv.xml | 37 ---------- res/xml/qwerty_no.xml | 37 ---------- res/xml/qwerty_pl.xml | 37 ---------- res/xml/qwerty_pt.xml | 38 ----------- res/xml/qwerty_ro.xml | 37 ---------- res/xml/qwerty_sv_se.xml | 41 ------------ res/xml/qwerty_tr.xml | 37 ---------- res/xml/qwerty_vi.xml | 37 ---------- res/xml/qwertz.xml | 37 ---------- res/xml/qwertz_cs.xml | 37 ---------- res/xml/qwertz_de.xml | 40 ----------- res/xml/qwertz_hu.xml | 38 ----------- res/xml/qwertz_sk.xml | 39 ----------- srcs/juloo.keyboard2/Config.java | 72 ++++++++++---------- srcs/juloo.keyboard2/Keyboard2.java | 2 +- 77 files changed, 1622 insertions(+), 1611 deletions(-) delete mode 100644 res/xml/ar_alt.xml delete mode 100644 res/xml/ar_pc.xml create mode 100644 res/xml/arab_alt.xml create mode 100644 res/xml/arab_pc.xml create mode 100644 res/xml/arab_pc_ckb.xml create mode 100644 res/xml/arab_pc_ir.xml delete mode 100644 res/xml/azerty.xml create mode 100644 res/xml/beng_national.xml create mode 100644 res/xml/beng_provat.xml delete mode 100644 res/xml/bengali_national.xml delete mode 100644 res/xml/bengali_provat.xml delete mode 100644 res/xml/bone.xml delete mode 100644 res/xml/colemak.xml create mode 100644 res/xml/cyrl_jcuken_ru.xml create mode 100644 res/xml/cyrl_jcuken_uk.xml create mode 100644 res/xml/cyrl_yaverti.xml create mode 100644 res/xml/deva_alt.xml create mode 100644 res/xml/deva_inscript.xml delete mode 100644 res/xml/devanagari_1.xml delete mode 100644 res/xml/devanagari_2.xml delete mode 100644 res/xml/dvorak.xml create mode 100644 res/xml/grek_qwerty.xml create mode 100644 res/xml/hang_dubeolsik_kr.xml delete mode 100644 res/xml/he_il_1452_1.xml delete mode 100644 res/xml/he_il_1452_2.xml create mode 100644 res/xml/hebr_1_il.xml create mode 100644 res/xml/hebr_2_il.xml delete mode 100644 res/xml/jcuken_ua.xml delete mode 100644 res/xml/kurdish.xml create mode 100644 res/xml/latn_azerty_fr.xml create mode 100644 res/xml/latn_bone.xml create mode 100644 res/xml/latn_colemak.xml create mode 100644 res/xml/latn_dvorak.xml create mode 100644 res/xml/latn_neo2.xml create mode 100644 res/xml/latn_qwerty_br.xml create mode 100644 res/xml/latn_qwerty_es.xml create mode 100644 res/xml/latn_qwerty_hu.xml create mode 100644 res/xml/latn_qwerty_lv.xml create mode 100644 res/xml/latn_qwerty_no.xml create mode 100644 res/xml/latn_qwerty_pl.xml create mode 100644 res/xml/latn_qwerty_ro.xml create mode 100644 res/xml/latn_qwerty_se.xml create mode 100644 res/xml/latn_qwerty_tr.xml create mode 100644 res/xml/latn_qwerty_us.xml create mode 100644 res/xml/latn_qwerty_vi.xml create mode 100644 res/xml/latn_qwertz.xml create mode 100644 res/xml/latn_qwertz_cz.xml create mode 100644 res/xml/latn_qwertz_de.xml create mode 100644 res/xml/latn_qwertz_hu.xml create mode 100644 res/xml/latn_qwertz_sk.xml delete mode 100644 res/xml/local_bgph1.xml delete mode 100644 res/xml/local_ru_jcuken.xml delete mode 100644 res/xml/neo2.xml delete mode 100644 res/xml/persian.xml delete mode 100644 res/xml/qwerty.xml delete mode 100644 res/xml/qwerty_el.xml delete mode 100644 res/xml/qwerty_es.xml delete mode 100644 res/xml/qwerty_hu.xml delete mode 100644 res/xml/qwerty_ko.xml delete mode 100644 res/xml/qwerty_lv.xml delete mode 100644 res/xml/qwerty_no.xml delete mode 100644 res/xml/qwerty_pl.xml delete mode 100644 res/xml/qwerty_pt.xml delete mode 100644 res/xml/qwerty_ro.xml delete mode 100644 res/xml/qwerty_sv_se.xml delete mode 100644 res/xml/qwerty_tr.xml delete mode 100644 res/xml/qwerty_vi.xml delete mode 100644 res/xml/qwertz.xml delete mode 100644 res/xml/qwertz_cs.xml delete mode 100644 res/xml/qwertz_de.xml delete mode 100644 res/xml/qwertz_hu.xml delete mode 100644 res/xml/qwertz_sk.xml diff --git a/check_layout.output b/check_layout.output index f08bf39..a1af606 100644 --- a/check_layout.output +++ b/check_layout.output @@ -1,114 +1,114 @@ -# 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 +# res/xml/grek_qwerty.xml +0 warnings +# 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/he_il_1452_2.xml +# res/xml/hebr_2_il.xml Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, } 1 warnings -# res/xml/jcuken_ua.xml +# res/xml/latn_azerty_fr.xml 0 warnings -# res/xml/kurdish.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/latn_bone.xml +Layout includes some ASCII punctuation but not all, missing: $ 1 warnings -# res/xml/local_ru_jcuken.xml +# res/xml/latn_colemak.xml 0 warnings -Not a layout file: res/xml/method.xml -# res/xml/neo2.xml +# res/xml/latn_dvorak.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: &, ?, @, ` -Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_emoji, switch_numeric, switch_second -Layout doesn't specify a script. -3 warnings -# res/xml/numpad.xml -Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~ -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 +# res/xml/latn_neo2.xml 0 warnings -# res/xml/qwerty_es.xml +# res/xml/latn_qwerty_br.xml 0 warnings -# res/xml/qwerty_hu.xml +# res/xml/latn_qwerty_es.xml 0 warnings -# res/xml/qwerty_ko.xml +# res/xml/latn_qwerty_hu.xml 0 warnings -# res/xml/qwerty_lv.xml +# res/xml/latn_qwerty_lv.xml 0 warnings -# res/xml/qwerty_no.xml +# res/xml/latn_qwerty_no.xml 0 warnings -# res/xml/qwerty_pl.xml +# res/xml/latn_qwerty_pl.xml 0 warnings -# res/xml/qwerty_pt.xml +# res/xml/latn_qwerty_ro.xml 0 warnings -# res/xml/qwerty_ro.xml +# res/xml/latn_qwerty_se.xml 0 warnings -# res/xml/qwerty_sv_se.xml +# res/xml/latn_qwerty_tr.xml 0 warnings -# res/xml/qwerty_tr.xml +# res/xml/latn_qwerty_us.xml 0 warnings -# res/xml/qwerty_vi.xml +# res/xml/latn_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 +# res/xml/latn_qwertz_cz.xml Layout includes some ASCII punctuation but not all, missing: ` 1 warnings -# res/xml/qwertz_de.xml +# res/xml/latn_qwertz_de.xml 0 warnings -# res/xml/qwertz_hu.xml +# res/xml/latn_qwertz_hu.xml 0 warnings -# res/xml/qwertz_sk.xml +# res/xml/latn_qwertz_sk.xml Layout includes some ASCII punctuation but not all, missing: \, ` 1 warnings -# res/xml/qwertz.xml +# res/xml/latn_qwertz.xml 0 warnings +Not a layout file: res/xml/method.xml +Not a layout file: res/xml/number_row.xml +# res/xml/numeric.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, switch_emoji, switch_numeric, switch_second +Layout doesn't specify a script. +3 warnings +# res/xml/numpad.xml +Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~ +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/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 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 (Polski) QWERTY (Swedish) - QWERTY (Hungarian) QWERTY (Türkçe) - QWERTY (Polski) 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/ar_alt.xml deleted file mode 100644 index bc5f123..0000000 --- a/res/xml/ar_alt.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/ar_pc.xml b/res/xml/ar_pc.xml deleted file mode 100644 index 8ab8650..0000000 --- a/res/xml/ar_pc.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/arab_alt.xml b/res/xml/arab_alt.xml new file mode 100644 index 0000000..bc5f123 --- /dev/null +++ b/res/xml/arab_alt.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/arab_pc.xml b/res/xml/arab_pc.xml new file mode 100644 index 0000000..8ab8650 --- /dev/null +++ b/res/xml/arab_pc.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/arab_pc_ckb.xml b/res/xml/arab_pc_ckb.xml new file mode 100644 index 0000000..bc8bb4a --- /dev/null +++ b/res/xml/arab_pc_ckb.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/arab_pc_ir.xml b/res/xml/arab_pc_ir.xml new file mode 100644 index 0000000..be2720c --- /dev/null +++ b/res/xml/arab_pc_ir.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml deleted file mode 100644 index 88f3db6..0000000 --- a/res/xml/azerty.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/beng_national.xml b/res/xml/beng_national.xml new file mode 100644 index 0000000..9d70e37 --- /dev/null +++ b/res/xml/beng_national.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/beng_provat.xml b/res/xml/beng_provat.xml new file mode 100644 index 0000000..caaa836 --- /dev/null +++ b/res/xml/beng_provat.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/bengali_national.xml b/res/xml/bengali_national.xml deleted file mode 100644 index 9d70e37..0000000 --- a/res/xml/bengali_national.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/bengali_provat.xml b/res/xml/bengali_provat.xml deleted file mode 100644 index caaa836..0000000 --- a/res/xml/bengali_provat.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/bone.xml b/res/xml/bone.xml deleted file mode 100644 index 612290c..0000000 --- a/res/xml/bone.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/colemak.xml b/res/xml/colemak.xml deleted file mode 100644 index 4bac3ff..0000000 --- a/res/xml/colemak.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/cyrl_jcuken_ru.xml b/res/xml/cyrl_jcuken_ru.xml new file mode 100644 index 0000000..5f392ca --- /dev/null +++ b/res/xml/cyrl_jcuken_ru.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/cyrl_jcuken_uk.xml b/res/xml/cyrl_jcuken_uk.xml new file mode 100644 index 0000000..d5ae950 --- /dev/null +++ b/res/xml/cyrl_jcuken_uk.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/cyrl_yaverti.xml b/res/xml/cyrl_yaverti.xml new file mode 100644 index 0000000..f4eb820 --- /dev/null +++ b/res/xml/cyrl_yaverti.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/deva_alt.xml b/res/xml/deva_alt.xml new file mode 100644 index 0000000..1606abd --- /dev/null +++ b/res/xml/deva_alt.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/deva_inscript.xml b/res/xml/deva_inscript.xml new file mode 100644 index 0000000..1f306e7 --- /dev/null +++ b/res/xml/deva_inscript.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/devanagari_1.xml b/res/xml/devanagari_1.xml deleted file mode 100644 index 1f306e7..0000000 --- a/res/xml/devanagari_1.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/devanagari_2.xml b/res/xml/devanagari_2.xml deleted file mode 100644 index 1606abd..0000000 --- a/res/xml/devanagari_2.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/dvorak.xml b/res/xml/dvorak.xml deleted file mode 100644 index 4dccc23..0000000 --- a/res/xml/dvorak.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/grek_qwerty.xml b/res/xml/grek_qwerty.xml new file mode 100644 index 0000000..50da475 --- /dev/null +++ b/res/xml/grek_qwerty.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/hang_dubeolsik_kr.xml b/res/xml/hang_dubeolsik_kr.xml new file mode 100644 index 0000000..998ab8f --- /dev/null +++ b/res/xml/hang_dubeolsik_kr.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/he_il_1452_1.xml b/res/xml/he_il_1452_1.xml deleted file mode 100644 index ff1b961..0000000 --- a/res/xml/he_il_1452_1.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/he_il_1452_2.xml b/res/xml/he_il_1452_2.xml deleted file mode 100644 index ebd6d84..0000000 --- a/res/xml/he_il_1452_2.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/hebr_1_il.xml b/res/xml/hebr_1_il.xml new file mode 100644 index 0000000..50ba86e --- /dev/null +++ b/res/xml/hebr_1_il.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/hebr_2_il.xml b/res/xml/hebr_2_il.xml new file mode 100644 index 0000000..ff83a91 --- /dev/null +++ b/res/xml/hebr_2_il.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/jcuken_ua.xml b/res/xml/jcuken_ua.xml deleted file mode 100644 index d5ae950..0000000 --- a/res/xml/jcuken_ua.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/kurdish.xml b/res/xml/kurdish.xml deleted file mode 100644 index bc8bb4a..0000000 --- a/res/xml/kurdish.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/latn_azerty_fr.xml b/res/xml/latn_azerty_fr.xml new file mode 100644 index 0000000..8434466 --- /dev/null +++ b/res/xml/latn_azerty_fr.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_bone.xml b/res/xml/latn_bone.xml new file mode 100644 index 0000000..2f8a012 --- /dev/null +++ b/res/xml/latn_bone.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_colemak.xml b/res/xml/latn_colemak.xml new file mode 100644 index 0000000..a7c78f2 --- /dev/null +++ b/res/xml/latn_colemak.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_dvorak.xml b/res/xml/latn_dvorak.xml new file mode 100644 index 0000000..4dccc23 --- /dev/null +++ b/res/xml/latn_dvorak.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_neo2.xml b/res/xml/latn_neo2.xml new file mode 100644 index 0000000..6f20f38 --- /dev/null +++ b/res/xml/latn_neo2.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_br.xml b/res/xml/latn_qwerty_br.xml new file mode 100644 index 0000000..fda6f93 --- /dev/null +++ b/res/xml/latn_qwerty_br.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_es.xml b/res/xml/latn_qwerty_es.xml new file mode 100644 index 0000000..273cfed --- /dev/null +++ b/res/xml/latn_qwerty_es.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_hu.xml b/res/xml/latn_qwerty_hu.xml new file mode 100644 index 0000000..302c304 --- /dev/null +++ b/res/xml/latn_qwerty_hu.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_lv.xml b/res/xml/latn_qwerty_lv.xml new file mode 100644 index 0000000..7f16d5a --- /dev/null +++ b/res/xml/latn_qwerty_lv.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_no.xml b/res/xml/latn_qwerty_no.xml new file mode 100644 index 0000000..33e9f3b --- /dev/null +++ b/res/xml/latn_qwerty_no.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_pl.xml b/res/xml/latn_qwerty_pl.xml new file mode 100644 index 0000000..1c28766 --- /dev/null +++ b/res/xml/latn_qwerty_pl.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_ro.xml b/res/xml/latn_qwerty_ro.xml new file mode 100644 index 0000000..e5e0a19 --- /dev/null +++ b/res/xml/latn_qwerty_ro.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_se.xml b/res/xml/latn_qwerty_se.xml new file mode 100644 index 0000000..69884d7 --- /dev/null +++ b/res/xml/latn_qwerty_se.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_tr.xml b/res/xml/latn_qwerty_tr.xml new file mode 100644 index 0000000..60f52a2 --- /dev/null +++ b/res/xml/latn_qwerty_tr.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_us.xml b/res/xml/latn_qwerty_us.xml new file mode 100644 index 0000000..06e91b9 --- /dev/null +++ b/res/xml/latn_qwerty_us.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwerty_vi.xml b/res/xml/latn_qwerty_vi.xml new file mode 100644 index 0000000..8b51299 --- /dev/null +++ b/res/xml/latn_qwerty_vi.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwertz.xml b/res/xml/latn_qwertz.xml new file mode 100644 index 0000000..107b738 --- /dev/null +++ b/res/xml/latn_qwertz.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwertz_cz.xml b/res/xml/latn_qwertz_cz.xml new file mode 100644 index 0000000..6546163 --- /dev/null +++ b/res/xml/latn_qwertz_cz.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwertz_de.xml b/res/xml/latn_qwertz_de.xml new file mode 100644 index 0000000..906c4fc --- /dev/null +++ b/res/xml/latn_qwertz_de.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwertz_hu.xml b/res/xml/latn_qwertz_hu.xml new file mode 100644 index 0000000..557b2e5 --- /dev/null +++ b/res/xml/latn_qwertz_hu.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/latn_qwertz_sk.xml b/res/xml/latn_qwertz_sk.xml new file mode 100644 index 0000000..7d3d1f4 --- /dev/null +++ b/res/xml/latn_qwertz_sk.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/xml/local_bgph1.xml b/res/xml/local_bgph1.xml deleted file mode 100644 index f4eb820..0000000 --- a/res/xml/local_bgph1.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/local_ru_jcuken.xml b/res/xml/local_ru_jcuken.xml deleted file mode 100644 index 5f392ca..0000000 --- a/res/xml/local_ru_jcuken.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/res/xml/neo2.xml b/res/xml/neo2.xml deleted file mode 100644 index 14dbf20..0000000 --- a/res/xml/neo2.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/persian.xml b/res/xml/persian.xml deleted file mode 100644 index d6a4127..0000000 --- a/res/xml/persian.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml deleted file mode 100644 index 06e91b9..0000000 --- a/res/xml/qwerty.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_el.xml b/res/xml/qwerty_el.xml deleted file mode 100644 index 50da475..0000000 --- a/res/xml/qwerty_el.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_es.xml b/res/xml/qwerty_es.xml deleted file mode 100644 index 273cfed..0000000 --- a/res/xml/qwerty_es.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_hu.xml b/res/xml/qwerty_hu.xml deleted file mode 100644 index 302c304..0000000 --- a/res/xml/qwerty_hu.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_ko.xml b/res/xml/qwerty_ko.xml deleted file mode 100644 index 998ab8f..0000000 --- a/res/xml/qwerty_ko.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_lv.xml b/res/xml/qwerty_lv.xml deleted file mode 100644 index 7f16d5a..0000000 --- a/res/xml/qwerty_lv.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_no.xml b/res/xml/qwerty_no.xml deleted file mode 100644 index 33e9f3b..0000000 --- a/res/xml/qwerty_no.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_pl.xml b/res/xml/qwerty_pl.xml deleted file mode 100644 index 1c28766..0000000 --- a/res/xml/qwerty_pl.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_pt.xml b/res/xml/qwerty_pt.xml deleted file mode 100644 index 0c9015e..0000000 --- a/res/xml/qwerty_pt.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_ro.xml b/res/xml/qwerty_ro.xml deleted file mode 100644 index e5e0a19..0000000 --- a/res/xml/qwerty_ro.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/qwerty_sv_se.xml deleted file mode 100644 index 69884d7..0000000 --- a/res/xml/qwerty_sv_se.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_tr.xml b/res/xml/qwerty_tr.xml deleted file mode 100644 index 60f52a2..0000000 --- a/res/xml/qwerty_tr.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwerty_vi.xml b/res/xml/qwerty_vi.xml deleted file mode 100644 index 1e3a64a..0000000 --- a/res/xml/qwerty_vi.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwertz.xml b/res/xml/qwertz.xml deleted file mode 100644 index 107b738..0000000 --- a/res/xml/qwertz.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwertz_cs.xml b/res/xml/qwertz_cs.xml deleted file mode 100644 index 6546163..0000000 --- a/res/xml/qwertz_cs.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwertz_de.xml b/res/xml/qwertz_de.xml deleted file mode 100644 index 6d01610..0000000 --- a/res/xml/qwertz_de.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwertz_hu.xml b/res/xml/qwertz_hu.xml deleted file mode 100644 index 557b2e5..0000000 --- a/res/xml/qwertz_hu.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/qwertz_sk.xml b/res/xml/qwertz_sk.xml deleted file mode 100644 index 7d3d1f4..0000000 --- a/res/xml/qwertz_sk.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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) { -- cgit v1.2.3