diff --git a/check_layout.output b/check_layout.output index efa674acc..5400c0fe4 100644 --- a/check_layout.output +++ b/check_layout.output @@ -68,6 +68,9 @@ Layout redefines the bottom row but some important keys are missing, missing: sw 2 warnings # res/xml/latn_qwerty_br.xml 0 warnings +# res/xml/latn_qwerty_cz.xml +Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder +1 warnings # res/xml/latn_qwerty_es.xml 0 warnings # res/xml/latn_qwerty_hu.xml diff --git a/check_layout.py b/check_layout.py index 0741ffa0c..d57d948af 100644 --- a/check_layout.py +++ b/check_layout.py @@ -60,8 +60,7 @@ def check_layout(layout): "Layout doesn't define some important keys") unexpected_keys(keys, ["copy", "paste", "cut", "selectAll", "shareText", - "pasteAsPlainText", "undo", "redo", "replaceText", - "textAssist", "autofill" ], + "pasteAsPlainText", "undo", "redo" ], "Layout contains editing keys") unexpected_keys(keys, [ "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 2072e7a93..6e4ff8802 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -93,9 +93,6 @@ Vložit jako prostý text Zpět Znovu - Nahradit - Asistovat - Předvyplnit Indikátor řadové číslovky Indikátor řadové číslovky Horní index diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 003f0472e..36d7c8737 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -93,9 +93,6 @@ Unformatiert einfügen Rückgängig Wiederholen - Ersetzen - Assistieren - Automatische Vervollständigung Ordinalzeichen Ordinalzeichen Hochgestellt diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 8f8703cd6..98b1e187f 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 7c58ca1f2..218fc7647 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 429333565..a36079c5a 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 1c7b96adf..6a7142c74 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index e8e9f4a28..4cb0dacab 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index b297df076..92d45e863 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -95,9 +95,6 @@ Ielīmēt kā vienkāršu tekstu Atsaukt Atatsaukt - Aizvietot - Palīgs - Automātiskā aizpilde Kārtas rādītājs Kārtas rādītājs Augšraksts diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 4aef205d6..474130c5e 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -93,9 +93,6 @@ Wklej sam tekst Cofnij Ponów - Zamień - Asystent - Autouzupełnianie Wskaźnik porządkowy (żeński) Wskaźnik porządkowy (męski) Indeks górny diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index b5c2bbcc5..8d5600227 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -93,9 +93,6 @@ Colar texto não formatado Desfazer Refazer - Substituir - Assistente - Autopreenchimento Indicador Ordinal Indicador Ordinal Sobrescrito diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 1de85fb56..bd60d18bc 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index c3490f452..8495f338f 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index cf6133c2f..85e119bb9 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 1580bf3d6..2f846bd1f 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3a8f6af8f..395813dbd 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -93,9 +93,6 @@ - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index dbf258138..3c86c85a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -93,9 +93,6 @@ Paste as plain text Undo Redo - Replace - Assist - Autofill Ordinal Indicator Ordinal Indicator Superscript diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java index ef9846cb7..8dacdeab7 100644 --- a/srcs/juloo.keyboard2/ExtraKeysPreference.java +++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java @@ -56,9 +56,6 @@ public class ExtraKeysPreference extends PreferenceCategory "pasteAsPlainText", "undo", "redo", - "replaceText", - "textAssist", - "autofill", "superscript", "subscript", }; @@ -92,8 +89,6 @@ static String key_description(Resources res, String name) case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break; case "undo": id = R.string.key_descr_undo; break; case "redo": id = R.string.key_descr_redo; break; - case "textAssist": id = R.string.key_descr_textAssist; break; - case "autofill": id = R.string.key_descr_autofill; break; case "ª": id = R.string.key_descr_ª; break; case "º": id = R.string.key_descr_º; break; case "superscript": id = R.string.key_descr_superscript; break; diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 10ce481ec..13b8ccae1 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -455,11 +455,12 @@ public static KeyValue getKeyByName(String name) case "pasteAsPlainText": return editingKey(0xE035, Editing.PASTE_PLAIN); case "undo": return editingKey(0xE036, Editing.UNDO); case "redo": return editingKey(0xE037, Editing.REDO); + case "cursor_left": return editingKey(0xE008, Editing.CURSOR_LEFT); + case "cursor_right": return editingKey(0xE006, Editing.CURSOR_RIGHT); + // These keys are not used case "replaceText": return editingKey("repl", Editing.REPLACE); case "textAssist": return editingKey(0xE038, Editing.ASSIST); case "autofill": return editingKey("auto", Editing.AUTOFILL); - case "cursor_left": return editingKey(0xE008, Editing.CURSOR_LEFT); - case "cursor_right": return editingKey(0xE006, Editing.CURSOR_RIGHT); /* Placeholder keys */ case "removed": return placeholderKey(Placeholder.REMOVED);