diff options
| author | Jules Aguillon | 2023-08-06 16:58:44 +0200 |
|---|---|---|
| committer | Jules Aguillon | 2023-08-06 17:15:35 +0200 |
| commit | 1eea9e25d25afa04f0f98618df07820d27c8fe2e (patch) | |
| tree | 415be1c0d377d56cee92543195d7aee0c4260650 /srcs | |
| parent | 45905f5f3b4831e8831f0f284b90b7d7e7f2e1e3 (diff) | |
| download | unexpected-keyboard-1eea9e25d25afa04f0f98618df07820d27c8fe2e.tar.gz unexpected-keyboard-1eea9e25d25afa04f0f98618df07820d27c8fe2e.zip | |
Remove the Accents option
This option makes less sense since per-script extra keys. It's also
getting in the way of an eventual "dead-key or accented-letters" option.
Diffstat (limited to 'srcs')
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 2 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2.java | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 53bd2d2..8a81556 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -49,7 +49,6 @@ final class Config public int keyActivatedOpacity; // 0 - 255 public boolean double_tap_lock_shift; public float characterSize; // Ratio - public int accents; // Values are R.values.pref_accents_v_* public int theme; // Values are R.style.* public boolean autocapitalisation; public boolean switch_input_immediate; @@ -153,7 +152,6 @@ final class Config characterSize = _prefs.getFloat("character_size", 1.f) * characterSizeScale; - accents = Integer.valueOf(_prefs.getString("accents", "1")); theme = getThemeId(res, _prefs.getString("theme", "")); autocapitalisation = _prefs.getBoolean("autocapitalisation", true); switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false); diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 51026e1..5f7442b 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -124,20 +124,10 @@ public class Keyboard2 extends InputMethodService { List<InputMethodSubtype> enabled_subtypes = getEnabledSubtypes(imm); List<ExtraKeys> extra_keys = new ArrayList<ExtraKeys>(); - switch (_config.accents) - { - // '3' was "all accents", now unused - case 1: case 3: - extra_keys.add(extra_keys_of_subtype(subtype)); - for (InputMethodSubtype s : enabled_subtypes) - extra_keys.add(extra_keys_of_subtype(s)); - break; - case 2: - extra_keys.add(extra_keys_of_subtype(subtype)); - break; - case 4: break; - default: throw new IllegalArgumentException(); - } + // Gather extra keys from all enabled subtypes + extra_keys.add(extra_keys_of_subtype(subtype)); + for (InputMethodSubtype s : enabled_subtypes) + extra_keys.add(extra_keys_of_subtype(s)); _config.extra_keys_subtype = ExtraKeys.merge(extra_keys); if (enabled_subtypes.size() > 1) _config.shouldOfferSwitchingToNextInputMethod = true; |