Merge "Add Seriban Latin keyboard layout as comments" (1f43ded6) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,15 @@
		<!-- Description for English (United States) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
		This should be identical to subtype_en_US aside from the trailing (%s). -->
		<string name="subtype_with_layout_en_US">English (US) (<xliff:g id="layout">%s</xliff:g>)</string>
		<!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
		Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25]
		<string name="subtype_serbian_cyrillic">Serbian (Cyrillic)</string>
		Description for Serbian Latin keyboard subtype [CHAR LIMIT=25]
		<string name="subtype_serbian_latin">Serbian (Latin)</string>
		Description for Serbian Latin keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
		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="layout">%s</xliff:g>)</string>
		-->
		<!-- Description for language agnostic keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language">No language</string>
		<!-- Description for language agnostic QWERTY keyboard subtype [CHAR LIMIT=25] -->

java/res/xml/method.xml

+15 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@
		sk: Slovak/qwerty
		sl: Slovenian/qwerty
		sr: Serbian/south_slavic
		(sr-Latn: Serbian/qwerty) # not yet implemented.
		sv: Swedish/nordic
		th: Thai/thai
		tl: Tagalog/spanish
		@@ -317,6 +318,20 @@
		android:imeSubtypeMode="keyboard"
		android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
		/>
		<!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
		<subtype android:icon="@drawable/ic_subtype_keyboard"
		android:label="@string/subtype_serbian_cyrillic"
		android:imeSubtypeLocale="sr"
		android:imeSubtypeMode="keyboard"
		android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
		/>
		<subtype android:icon="@drawable/ic_subtype_keyboard"
		android:label="@string/subtype_serbian_latin"
		android:imeSubtypeLocale="sr-Latn"
		android:imeSubtypeMode="keyboard"
		android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
		/>
		-->
		<subtype android:icon="@drawable/ic_subtype_keyboard"
		android:label="@string/subtype_generic"
		android:imeSubtypeLocale="sv"

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -2098,6 +2098,24 @@ public final class KeyboardTextsSet {
		null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
		null, null, null, null, null,
		/* ~34 */
		// TODO: Move these to sr-Latn once we can handle IETF language tag with script name specified.
		// BEGIN: More keys definitions for Serbian (Latin)
		// U+0161: "š" LATIN SMALL LETTER S WITH CARON
		// U+00DF: "ß" LATIN SMALL LETTER SHARP S
		// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
		// <string name="more_keys_for_s">š,ß,ś</string>
		// U+010D: "č" LATIN SMALL LETTER C WITH CARON
		// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
		// U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
		// <string name="more_keys_for_c">č,ç,ć</string>
		// U+010F: "ď" LATIN SMALL LETTER D WITH CARON
		// <string name="more_keys_for_d">ď</string>
		// U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
		// U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
		// U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
		// <string name="more_keys_for_z">ž,ź,ż</string>
		// END: More keys definitions for Serbian (Latin)
		// BEGIN: More keys definitions for Serbian (Cyrillic)
		// U+0437: "з" CYRILLIC SMALL LETTER ZE
		/* 35 */ "\u0437",
		// U+045B: "ћ" CYRILLIC SMALL LETTER TSHE
		@@ -2111,6 +2129,7 @@ public final class KeyboardTextsSet {
		// U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE
		/* 40 */ "\u045D",
		/* 41 */ null,
		// END: More keys definitions for Serbian (Cyrillic)
		// U+2018: "‘" LEFT SINGLE QUOTATION MARK
		// U+2019: "’" RIGHT SINGLE QUOTATION MARK
		// U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

tools/maketext/res/values-sr/donottranslate-more-keys.xml

+19 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,24 @@
		*/
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- TODO: Move these to sr-Latn once we can handle IETF language tag with script name specified.
		BEGIN: More keys definitions for Serbian (Latin)
		U+0161: "š" LATIN SMALL LETTER S WITH CARON
		U+00DF: "ß" LATIN SMALL LETTER SHARP S
		U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
		<string name="more_keys_for_s">š,ß,ś</string>
		U+010D: "č" LATIN SMALL LETTER C WITH CARON
		U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
		U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
		<string name="more_keys_for_c">č,ç,ć</string>
		U+010F: "ď" LATIN SMALL LETTER D WITH CARON
		<string name="more_keys_for_d">ď</string>
		U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
		U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
		U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
		<string name="more_keys_for_z">ž,ź,ż</string>
		END: More keys definitions for Serbian (Latin) -->
		<!-- BEGIN: More keys definitions for Serbian (Cyrillic) -->
		<!-- U+0437: "з" CYRILLIC SMALL LETTER ZE -->
		<string name="keylabel_for_south_slavic_row1_6">з</string>
		<!-- U+045B: "ћ" CYRILLIC SMALL LETTER TSHE -->
		@@ -30,6 +48,7 @@
		<string name="more_keys_for_cyrillic_ie">ѐ</string>
		<!-- U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
		<string name="more_keys_for_cyrillic_i">ѝ</string>
		<!-- END: More keys definitions for Serbian (Cyrillic) -->
		<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
		U+2019: "’" RIGHT SINGLE QUOTATION MARK
		U+201A: "‚" SINGLE LOW-9 QUOTATION MARK