Merge "Add Tagalog keyboard layout" (fe45f29e) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml/method.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@
		sr: Serbian/south_slavic
		sv: Swedish/nordic
		th: Thai/thai
		tl: Tagalog/spanish
		tr: Turkish/qwerty
		uk: Ukrainian/east_slavic
		vi: Vietnamese/qwerty
		@@ -321,6 +322,12 @@
		android:imeSubtypeMode="keyboard"
		android:imeSubtypeExtraValue="KeyboardLayoutSet=thai"
		/>
		<subtype android:icon="@drawable/ic_subtype_keyboard"
		android:label="@string/subtype_generic"
		android:imeSubtypeLocale="tl"
		android:imeSubtypeMode="keyboard"
		android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable"
		/>
		<subtype android:icon="@drawable/ic_subtype_keyboard"
		android:label="@string/subtype_generic"
		android:imeSubtypeLocale="tr"

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

+55 −0

Original line number	Diff line number	Diff line
		@@ -2169,6 +2169,60 @@ public final class KeyboardTextsSet {
		/* 24 */ "\u00E6",
		};

		/* Language tl: Tagalog */
		private static final String[] LANGUAGE_tl = {
		// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
		// U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
		// U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
		// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
		// U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
		// U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
		// U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
		// U+00E6: "æ" LATIN SMALL LETTER AE
		// U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
		// U+00AA: "ª" FEMININE ORDINAL INDICATOR
		/* 0 */ "\u00E1,\u00E0,\u00E4,\u00E2,\u00E3,\u00E5,\u0105,\u00E6,\u0101,\u00AA",
		// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
		// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
		// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
		// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
		// U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
		// U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
		// U+0113: "ē" LATIN SMALL LETTER E WITH MACRON
		/* 1 */ "\u00E9,\u00E8,\u00EB,\u00EA,\u0119,\u0117,\u0113",
		// U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
		// U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
		// U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
		// U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
		// U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
		// U+012B: "ī" LATIN SMALL LETTER I WITH MACRON
		/* 2 */ "\u00ED,\u00EF,\u00EC,\u00EE,\u012F,\u012B",
		// U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
		// U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
		// U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
		// U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
		// U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
		// U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
		// U+0153: "œ" LATIN SMALL LIGATURE OE
		// U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
		// U+00BA: "º" MASCULINE ORDINAL INDICATOR
		/* 3 */ "\u00F3,\u00F2,\u00F6,\u00F4,\u00F5,\u00F8,\u0153,\u014D,\u00BA",
		// U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
		// U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
		// U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
		// U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
		// U+016B: "ū" LATIN SMALL LETTER U WITH MACRON
		/* 4 */ "\u00FA,\u00FC,\u00F9,\u00FB,\u016B",
		/* 5 */ null,
		// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
		// U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
		/* 6 */ "\u00F1,\u0144",
		// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
		// U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
		// U+010D: "č" LATIN SMALL LETTER C WITH CARON
		/* 7 */ "\u00E7,\u0107,\u010D",
		};

		/* Language tr: Turkish */
		private static final String[] LANGUAGE_tr = {
		// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
		@@ -2477,6 +2531,7 @@ public final class KeyboardTextsSet {
		"sl", LANGUAGE_sl, /* Slovenian */
		"sr", LANGUAGE_sr, /* Serbian */
		"sv", LANGUAGE_sv, /* Swedish */
		"tl", LANGUAGE_tl, /* Tagalog */
		"tr", LANGUAGE_tr, /* Turkish */
		"uk", LANGUAGE_uk, /* Ukrainian */
		"vi", LANGUAGE_vi, /* Vietnamese */

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

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2012, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
		U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
		U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS
		U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
		U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE
		U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE
		U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK
		U+00E6: "æ" LATIN SMALL LETTER AE
		U+0101: "ā" LATIN SMALL LETTER A WITH MACRON
		U+00AA: "ª" FEMININE ORDINAL INDICATOR -->
		<string name="more_keys_for_a">á,à,ä,â,ã,å,ą,æ,ā,ª</string>
		<!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
		U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
		U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS
		U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
		U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK
		U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE
		U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->
		<string name="more_keys_for_e">é,è,ë,ê,ę,ė,ē</string>
		<!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE
		U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS
		U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE
		U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX
		U+012F: "į" LATIN SMALL LETTER I WITH OGONEK
		U+012B: "ī" LATIN SMALL LETTER I WITH MACRON -->
		<string name="more_keys_for_i">í,ï,ì,î,į,ī</string>
		<!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE
		U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
		U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS
		U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX
		U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE
		U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE
		U+0153: "œ" LATIN SMALL LIGATURE OE
		U+014D: "ō" LATIN SMALL LETTER O WITH MACRON
		U+00BA: "º" MASCULINE ORDINAL INDICATOR -->
		<string name="more_keys_for_o">ó,ò,ö,ô,õ,ø,œ,ō,º</string>
		<!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE
		U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
		U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE
		U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX
		U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
		<string name="more_keys_for_u">ú,ü,ù,û,ū</string>
		<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
		U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
		<string name="more_keys_for_n">ñ,ń</string>
		<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
		U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
		U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
		<string name="more_keys_for_c">ç,ć,č</string>
		</resources>