diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml index 027d3a2..f9ca3ea 100644 --- a/res/xml/azerty.xml +++ b/res/xml/azerty.xml @@ -14,7 +14,7 @@ - + diff --git a/res/xml/method.xml b/res/xml/method.xml index c5f1092..0698beb 100644 --- a/res/xml/method.xml +++ b/res/xml/method.xml @@ -30,4 +30,11 @@ android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu" /> + diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml index b979e14..bde9f02 100644 --- a/res/xml/qwerty.xml +++ b/res/xml/qwerty.xml @@ -14,7 +14,7 @@ - + diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 67722c5..8c6a46a 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -118,6 +118,7 @@ class Config case "tilde": return KeyValue.FLAG_ACCENT4; case "cedille": return KeyValue.FLAG_ACCENT5; case "trema": return KeyValue.FLAG_ACCENT6; + case "ring": return KeyValue.FLAG_ACCENT_RING; default: throw new RuntimeException(name); } } diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java index 3e70912..7b7d971 100644 --- a/srcs/juloo.keyboard2/KeyModifier.java +++ b/srcs/juloo.keyboard2/KeyModifier.java @@ -102,6 +102,11 @@ class KeyModifier case '-': return '÷'; default: return (char)KeyCharacterMap.getDeadChar('\u00A8', c); } + case KeyValue.FLAG_ACCENT_RING: + switch (c) + { + default: return (char)KeyCharacterMap.getDeadChar('\u02DA', c); + } case KeyValue.FLAG_ACCENT_SUPERSCRIPT: switch (c) { diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index 19a58f8..6677248 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -41,10 +41,11 @@ class KeyValue public static final int FLAG_ACCENT6 = (1 << 21); // Tréma public static final int FLAG_ACCENT_SUPERSCRIPT = (1 << 22); public static final int FLAG_ACCENT_SUBSCRIPT = (1 << 23); + public static final int FLAG_ACCENT_RING = (1 << 24); public static final int FLAGS_ACCENTS = FLAG_ACCENT1 | FLAG_ACCENT2 | FLAG_ACCENT3 | FLAG_ACCENT4 | FLAG_ACCENT5 | FLAG_ACCENT6 | - FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT; + FLAG_ACCENT_SUPERSCRIPT | FLAG_ACCENT_SUBSCRIPT | FLAG_ACCENT_RING; public final String name; public final String symbol; @@ -131,6 +132,7 @@ class KeyValue addModifierKey("accent_tilde", "◌̃", FLAG_ACCENT4); addModifierKey("accent_cedille", "◌̧", FLAG_ACCENT5); addModifierKey("accent_trema", "◌̈", FLAG_ACCENT6); + addModifierKey("accent_ring", "◌̊", FLAG_ACCENT_RING); addModifierKey("superscript", "◌͆", FLAG_ACCENT_SUPERSCRIPT); addModifierKey("subscript", "◌̺", FLAG_ACCENT_SUBSCRIPT); addModifierKey("fn", "Fn", FLAG_FN);