diff options
| -rw-r--r-- | res/xml/azerty.xml | 2 | ||||
| -rw-r--r-- | res/xml/method.xml | 1 | ||||
| -rw-r--r-- | res/xml/qwerty.xml | 2 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 1 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/KeyValue.java | 14 |
5 files changed, 15 insertions, 5 deletions
diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml index ae079f0..a0fb1fd 100644 --- a/res/xml/azerty.xml +++ b/res/xml/azerty.xml @@ -14,7 +14,7 @@ </row> <row> <key key0="q" key1="tab"/> - <key key0="s" key1="accent_ring"/> + <key key0="s" key1="accent_ring" key3="ß"/> <key key0="d" key1="accent_grave" key3="accent_aigu"/> <key key0="f" key3="{" key4="}"/> <key key0="g" key3="[" key4="]"/> diff --git a/res/xml/method.xml b/res/xml/method.xml index 481bb4f..be32b5d 100644 --- a/res/xml/method.xml +++ b/res/xml/method.xml @@ -3,6 +3,7 @@ <subtype android:label="%s" android:languageTag="en" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/> <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=grave|aigu|circonflexe|cedille|trema"/> <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=aigu|tilde|trema"/> + <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=trema|szlig"/> <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=grave|aigu"/> <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=aigu|trema|ring"/> </input-method> diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml index 297e0e7..a015b0d 100644 --- a/res/xml/qwerty.xml +++ b/res/xml/qwerty.xml @@ -14,7 +14,7 @@ </row> <row> <key shift="0.5" key0="a" key1="tab" key2="`"/> - <key key0="s" key1="accent_ring"/> + <key key0="s" key1="accent_ring" key3="ß"/> <key key0="d" key1="accent_grave" key3="accent_aigu"/> <key key0="f"/> <key key0="g" key2="-" key3="_"/> diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 8a2199f..43c039f 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -118,6 +118,7 @@ final class Config case "cedille": return KeyValue.FLAG_ACCENT5; case "trema": return KeyValue.FLAG_ACCENT6; case "ring": return KeyValue.FLAG_ACCENT_RING; + case "szlig": return KeyValue.FLAG_LANG_SZLIG; default: throw new RuntimeException(name); } } diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 26b3c9e..e2a961c 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -48,7 +48,9 @@ class KeyValue FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT | FLAG_ACCENT_RING; // Language specific keys - public static final int FLAGS_LANGS = 0; + public static final int FLAG_LANG_SZLIG = (1 << 25); + + public static final int FLAGS_LANGS = FLAG_LANG_SZLIG; public static final int FLAGS_NOT_HIDDEN_ACCENTS = FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT; @@ -99,10 +101,15 @@ class KeyValue keys.put(name, new KeyValue(name, symbol, c, event, flags)); } - private static void addCharKey(char c, int event) + private static void addCharKey(char c, int event, int flags) { String name = String.valueOf(c); - addKey(name, name, c, event, 0); + addKey(name, name, c, event, flags); + } + + private static void addCharKey(char c, int event) + { + addCharKey(c, event, 0); } private static void addModifierKey(String name, String symbol, int extra_flags) @@ -199,6 +206,7 @@ class KeyValue addCharKey('#', KeyEvent.KEYCODE_POUND); addCharKey('(', KeyEvent.KEYCODE_NUMPAD_LEFT_PAREN); addCharKey(')', KeyEvent.KEYCODE_NUMPAD_RIGHT_PAREN); + addCharKey('ß', EVENT_NONE, FLAG_LANG_SZLIG); addSpecialKey("config", "Conf", EVENT_CONFIG); addSpecialKey("switch_text", "ABC", EVENT_SWITCH_TEXT); |