From 4d104eacf319060d4c78b9f9328b050de909eb93 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Mon, 6 Jun 2022 00:55:16 +0200
Subject: [PATCH] Remove the option "Show every accents"

This option cannot be implemented easily now that the set of "accents"
(localized keys) isn't defined.
---
 res/values-de/strings.xml           | 1 -
 res/values-es/strings.xml           | 1 -
 res/values-fr/strings.xml           | 1 -
 res/values-ko/strings.xml           | 1 -
 res/values-lv/strings.xml           | 1 -
 res/values-pt/strings.xml           | 1 -
 res/values-tr/strings.xml           | 1 -
 res/values-zh-rCN/strings.xml       | 1 -
 res/values/arrays.xml               | 2 --
 res/values/strings.xml              | 1 -
 srcs/juloo.keyboard2/Keyboard2.java | 4 ++--
 11 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 96eba7e..39621b4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -7,7 +7,6 @@
   <string name="pref_accents_title">Akzente</string>
   <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
   <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
-  <string name="pref_accents_e_all">Alle Akzente anzeigen</string>
   <string name="pref_accents_e_none">Akzente verbergen</string>
   <string name="pref_programming_layout_title">Tastaturlayout zum Programmieren</string>
   <string name="pref_programming_layout_none">Keines</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ec78b26..bc5827b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -7,7 +7,6 @@
   <string name="pref_accents_title">Acentos</string>
   <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
   <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</string>
-  <string name="pref_accents_e_all">Mostrar todos los acentos</string>
   <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_category_typing">Escribiendo</string>
   <string name="pref_swipe_dist_title">Distancia para deslizar</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 25f1b97..431264e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -7,7 +7,6 @@
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
   <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
-  <string name="pref_accents_e_all">Afficher tous les accents</string>
   <string name="pref_accents_e_none">Cacher les accents</string>
   <string name="pref_category_typing">Saisie</string>
   <string name="pref_swipe_dist_title">Distance de swipe</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2e652af..a230c30 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -7,7 +7,6 @@
   <string name="pref_accents_title">악센트</string>
   <string name="pref_accents_e_all_installed">설치된 모든 언어의 악센트 표시</string>
   <string name="pref_accents_e_selected">선택한 언어의 악센트만 표시</string>
-  <string name="pref_accents_e_all">모든 언어의 악센트 표시</string>
   <string name="pref_accents_e_none">모든 언어의 악센트 숨기기</string>
   <string name="pref_category_typing">타자</string>
   <string name="pref_swipe_dist_title">스와이프 범위</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b886ed6..d8a92e5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -9,7 +9,6 @@
   <string name="pref_accents_title">Uzsvara zīmes</string>
   <string name="pref_accents_e_all_installed">Rādīt uzsvara zīmes visām uzstādītajām valodām</string>
   <string name="pref_accents_e_selected">Rādīt uzsvara zīmes tikai atlasītajām valodām</string>
-  <string name="pref_accents_e_all">Rādīt visas uzsvara zīmes</string>
   <string name="pref_accents_e_none">Paslēpt uzsvara zīmes</string>
   <string name="pref_programming_layout_title">Tastatūras izkārtojums programmēšanai</string>
   <string name="pref_programming_layout_none">Neviens</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3d38cbf..1f88fd3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -9,7 +9,6 @@
   <string name="pref_accents_title">Acentos</string>
   <string name="pref_accents_e_all_installed">Mostrar acentos para todos os idiomas instalados</string>
   <string name="pref_accents_e_selected">Mostrar acentos só para o idioma selecionado</string>
-  <string name="pref_accents_e_all">Mostrar todos acentos</string>
   <string name="pref_accents_e_none">Ocultar acentos</string>
   <string name="pref_programming_layout_title">Layout do teclado para programação</string>
   <string name="pref_programming_layout_none">Nenhum</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 34f740d..1f72a74 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -9,7 +9,6 @@
   <string name="pref_accents_title">Aksanlar</string>
   <string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
   <string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
-  <string name="pref_accents_e_all">Tüm aksanları göster</string>
   <string name="pref_accents_e_none">Aksanları gizle</string>
   <string name="pref_programming_layout_title">Programlama için klavye düzeni</string>
   <string name="pref_programming_layout_none">Hiçbiri</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1ef8044..474c6938 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -9,7 +9,6 @@
   <string name="pref_accents_title">声调</string>
   <string name="pref_accents_e_all_installed">显示所有安装的语言的声调符号</string>
   <string name="pref_accents_e_selected">只显示选择的语言的声调符号</string>
-  <string name="pref_accents_e_all">显示所有声调符号</string>
   <string name="pref_accents_e_none">隐藏声调符号</string>
   <string name="pref_category_typing">输入</string>
   <string name="pref_swipe_dist_title">滑动触发距离</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a46999f..c3f952e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -53,13 +53,11 @@
   <string-array name="pref_accents_entries">
     <item>@string/pref_accents_e_all_installed</item>
     <item>@string/pref_accents_e_selected</item>
-    <item>@string/pref_accents_e_all</item>
     <item>@string/pref_accents_e_none</item>
   </string-array>
   <string-array name="pref_accents_values">
     <item>1</item>
     <item>2</item>
-    <item>3</item>
     <item>4</item>
   </string-array>
   <string-array name="pref_theme_entries">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 250c2ac..d223d71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,7 +9,6 @@
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
   <string name="pref_accents_e_selected">Only show accents for the selected language</string>
-  <string name="pref_accents_e_all">Show all accents</string>
   <string name="pref_accents_e_none">Hide accents</string>
   <string name="pref_programming_layout_title">Keyboard layout for programming</string>
   <string name="pref_programming_layout_none">None</string>
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 77fc0bf..f57d7fe 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -96,7 +96,8 @@ public class Keyboard2 extends InputMethodService
     List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm);
     switch (_config.accents)
     {
-      case 1:
+      // '3' was "all accents", now unused
+      case 1: case 3:
         extra_keys_of_subtype(extra_keys, subtype);
         for (InputMethodSubtype s : enabled_subtypes)
           extra_keys_of_subtype(extra_keys, s);
@@ -104,7 +105,6 @@ public class Keyboard2 extends InputMethodService
       case 2:
         extra_keys_of_subtype(extra_keys, subtype);
         break;
-      case 3: extra_keys = null; break;
       case 4: break;
       default: throw new IllegalArgumentException();
     }