Remove unused editing keys from the settings

These keys don't seem to have a purpose, which is confusing.
Julow · Sep 3, 2023 · 816269a · 816269a
1 parent 2349868
commit 816269a
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 57 deletions.
diff --git 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
@@ -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
@@ -93,9 +93,6 @@
   <string name="key_descr_pasteAsPlainText">Vložit jako prostý text</string>
   <string name="key_descr_undo">Zpět</string>
   <string name="key_descr_redo">Znovu</string>
-  <string name="key_descr_replaceText">Nahradit</string>
-  <string name="key_descr_textAssist">Asistovat</string>
-  <string name="key_descr_autofill">Předvyplnit</string>
   <string name="key_descr_ª">Indikátor řadové číslovky</string>
   <string name="key_descr_º">Indikátor řadové číslovky</string>
   <string name="key_descr_superscript">Horní index</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -93,9 +93,6 @@
   <string name="key_descr_pasteAsPlainText">Unformatiert einfügen</string>
   <string name="key_descr_undo">Rückgängig</string>
   <string name="key_descr_redo">Wiederholen</string>
-  <string name="key_descr_replaceText">Ersetzen</string>
-  <string name="key_descr_textAssist">Assistieren</string>
-  <string name="key_descr_autofill">Automatische Vervollständigung</string>
   <string name="key_descr_ª">Ordinalzeichen</string>
   <string name="key_descr_º">Ordinalzeichen</string>
   <string name="key_descr_superscript">Hochgestellt</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
@@ -95,9 +95,6 @@
   <string name="key_descr_pasteAsPlainText">Ielīmēt kā vienkāršu tekstu</string>
   <string name="key_descr_undo">Atsaukt</string>
   <string name="key_descr_redo">Atatsaukt</string>
-  <string name="key_descr_replaceText">Aizvietot</string>
-  <string name="key_descr_textAssist">Palīgs</string>
-  <string name="key_descr_autofill">Automātiskā aizpilde</string>
   <string name="key_descr_ª">Kārtas rādītājs</string>
   <string name="key_descr_º">Kārtas rādītājs</string>
   <string name="key_descr_superscript">Augšraksts</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
@@ -93,9 +93,6 @@
   <string name="key_descr_pasteAsPlainText">Wklej sam tekst</string>
   <string name="key_descr_undo">Cofnij</string>
   <string name="key_descr_redo">Ponów</string>
-  <string name="key_descr_replaceText">Zamień</string>
-  <string name="key_descr_textAssist">Asystent</string>
-  <string name="key_descr_autofill">Autouzupełnianie</string>
   <string name="key_descr_ª">Wskaźnik porządkowy (żeński)</string>
   <string name="key_descr_º">Wskaźnik porządkowy (męski)</string>
   <string name="key_descr_superscript">Indeks górny</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
@@ -93,9 +93,6 @@
   <string name="key_descr_pasteAsPlainText">Colar texto não formatado</string>
   <string name="key_descr_undo">Desfazer</string>
   <string name="key_descr_redo">Refazer</string>
-  <string name="key_descr_replaceText">Substituir</string>
-  <string name="key_descr_textAssist">Assistente</string>
-  <string name="key_descr_autofill">Autopreenchimento</string>
   <string name="key_descr_ª">Indicador Ordinal</string>
   <string name="key_descr_º">Indicador Ordinal</string>
   <string name="key_descr_superscript">Sobrescrito</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
@@ -93,9 +93,6 @@
   <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
   <!-- <string name="key_descr_undo">Undo</string> -->
   <!-- <string name="key_descr_redo">Redo</string> -->
-  <!-- <string name="key_descr_replaceText">Replace</string> -->
-  <!-- <string name="key_descr_textAssist">Assist</string> -->
-  <!-- <string name="key_descr_autofill">Autofill</string> -->
   <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
   <!-- <string name="key_descr_superscript">Superscript</string> -->

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -93,9 +93,6 @@
   <string name="key_descr_pasteAsPlainText">Paste as plain text</string>
   <string name="key_descr_undo">Undo</string>
   <string name="key_descr_redo">Redo</string>
-  <string name="key_descr_replaceText">Replace</string>
-  <string name="key_descr_textAssist">Assist</string>
-  <string name="key_descr_autofill">Autofill</string>
   <string name="key_descr_ª">Ordinal Indicator</string>
   <string name="key_descr_º">Ordinal Indicator</string>
   <string name="key_descr_superscript">Superscript</string>

diff --git 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
@@ -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);