aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/strings.xml18
-rw-r--r--java/res/xml/method.xml9
-rw-r--r--java/res/xml/rowkeys_greek1.xml8
3 files changed, 19 insertions, 16 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 937a79933..a4e2d2914 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -365,18 +365,12 @@
(Compact) can be an abbreviation to fit in the CHAR LIMIT.
TODO: Remove translatable=false once we are settled down with the naming. -->
<string name="subtype_generic_compact" translatable="false"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string>
- <!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
- Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25]
- (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT.
- <string name="subtype_serbian_cyrillic">Serbian (Cyrillic)</string>
- Description for Serbian Latin keyboard subtype [CHAR LIMIT=25]
- (Latin) can be an abbreviation to fit in the CHAR LIMIT.
- <string name="subtype_serbian_latin">Serbian (Latin)</string>
- Description for Serbian Latin keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
- (Latin) can be an abbreviation to fit in the CHAR LIMIT.
- This should be identical to subtype_serbian_latin aside from the trailing (%s).
- <string name="subtype_with_layout_sr-Latn">Serbian (Latin) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
- -->
+ <!-- Description for "LANGUAGE_NAME" (Cyrillic) keyboard subtype [CHAR LIMIT=25]
+ (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. -->
+ <string name="subtype_generic_cyrillic"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Cyrillic)</string>
+ <!-- Description for "LANGUAGE_NAME" (Latin) keyboard subtype [CHAR LIMIT=25]
+ (Latin) can be an abbreviation to fit in the CHAR LIMIT. -->
+ <string name="subtype_generic_latin"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Latin)</string>
<!-- This string is displayed in a language list that allows to choose a language for
suggestions in a software keyboard. This setting won't give suggestions in any particular
language, hence "No language".
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 6d8f78773..594378fb4 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -57,6 +57,7 @@
in: Indonesian/qwerty # "id" is the official language code of Indonesian.
is: Icelandic/qwerty
it: Italian/qwerty
+ it_CH: Italian (Switzerland)/swiss
iw: Hebrew/hebrew # "he" is the official language code of Hebrew.
ka_GE: Georgian (Georgia)/georgian
kk: Kazakh/east_slavic
@@ -385,6 +386,14 @@
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
android:isAsciiCapable="true"
/>
+ <subtype android:icon="@drawable/ic_ime_switcher_dark"
+ android:label="@string/subtype_generic"
+ android:subtypeId="0xd914fe1a"
+ android:imeSubtypeLocale="it_CH"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,EmojiCapable"
+ android:isAsciiCapable="true"
+ />
<!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
diff --git a/java/res/xml/rowkeys_greek1.xml b/java/res/xml/rowkeys_greek1.xml
index c5033d029..6d767794c 100644
--- a/java/res/xml/rowkeys_greek1.xml
+++ b/java/res/xml/rowkeys_greek1.xml
@@ -69,7 +69,7 @@
latin:keySpec="&#x03B5;"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="&#x03AD;" />
+ latin:moreKeys="&#x03AD;,%" />
<!-- U+03C1: "ρ" GREEK SMALL LETTER RHO -->
<Key
latin:keySpec="&#x03C1;"
@@ -88,7 +88,7 @@
latin:keySpec="&#x03C5;"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="&#x03CD;,&#x03CB;,&#x03B0;" />
+ latin:moreKeys="&#x03CD;,%,&#x03CB;,&#x03B0;" />
<!-- U+03B8: "θ" GREEK SMALL LETTER THETA -->
<Key
latin:keySpec="&#x03B8;"
@@ -102,14 +102,14 @@
latin:keySpec="&#x03B9;"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="&#x03AF;,&#x03CA;,&#x0390;" />
+ latin:moreKeys="&#x03AF;,%,&#x03CA;,&#x0390;" />
<!-- U+03BF: "ο" GREEK SMALL LETTER OMICRON
U+03CC: "ό" GREEK SMALL LETTER OMICRON WITH TONOS -->
<Key
latin:keySpec="&#x03BF;"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="&#x03CC;" />
+ latin:moreKeys="&#x03CC;,%" />
<!-- U+03C0: "π" GREEK SMALL LETTER PI -->
<Key
latin:keySpec="&#x03C0;"