am 3b5c05f1: Merge "Fix Catalan keyboard layout" (53d41537) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/rowkeys_symbols2.xml

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -62,10 +62,11 @@
	latin:keyLabel="*"		latin:keyLabel="*"
	latin:moreKeys="!text/more_keys_for_star" />		latin:moreKeys="!text/more_keys_for_star" />
	<!-- U+2013: "–" EN DASH		<!-- U+2013: "–" EN DASH
	U+2014: "—" EM DASH -->		U+2014: "—" EM DASH
			U+00B7: "·" MIDDLE DOT -->
	<Key		<Key
	latin:keyLabel="-"		latin:keyLabel="-"
	latin:moreKeys="_,–,—" />		latin:moreKeys="_,–,—,·" />
	<Key		<Key
	latin:keyLabel="+"		latin:keyLabel="+"
	latin:moreKeys="!text/more_keys_for_plus" />		latin:moreKeys="!text/more_keys_for_plus" />

java/res/xml/rowkeys_symbols2.xml

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -54,10 +54,11 @@
	latin:keyLabel="*"		latin:keyLabel="*"
	latin:moreKeys="!text/more_keys_for_star" />		latin:moreKeys="!text/more_keys_for_star" />
	<!-- U+2013: "–" EN DASH		<!-- U+2013: "–" EN DASH
	U+2014: "—" EM DASH -->		U+2014: "—" EM DASH
			U+00B7: "·" MIDDLE DOT -->
	<Key		<Key
	latin:keyLabel="-"		latin:keyLabel="-"
	latin:moreKeys="_,–,—" />		latin:moreKeys="_,–,—,·" />
	<Key		<Key
	latin:keyLabel="+"		latin:keyLabel="+"
	latin:moreKeys="!text/more_keys_for_plus" />		latin:moreKeys="!text/more_keys_for_plus" />

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

+27 −4

Original line number	Original line	Diff line number	Diff line
	@@ -374,8 +374,7 @@ public final class KeyboardTextsSet {
	/* 115 */ "w",		/* 115 */ "w",
	/* 116 */ "y",		/* 116 */ "y",
	/* 117 */ "x",		/* 117 */ "x",
	// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE		/* 118 */ EMPTY,
	/* 118 */ "\u00F1",
	/* 119 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",		/* 119 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",
	/* 120 */ "!icon/settings_key\|!code/key_settings",		/* 120 */ "!icon/settings_key\|!code/key_settings",
	/* 121 */ "!icon/shortcut_key\|!code/key_shortcut",		/* 121 */ "!icon/shortcut_key\|!code/key_shortcut",
	@@ -777,9 +776,28 @@ public final class KeyboardTextsSet {
	/* 8~ */		/* 8~ */
	null, null, null, null, null, null,		null, null, null, null, null, null,
	/* ~13 */		/* ~13 */
	// U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT		// U+00B7: "·" MIDDLE DOT
	// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE		// U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
	/* 14 */ "\u0140,\u0142",		/* 14 */ "l\u00B7l,\u0142",
			/* 15~ */
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null,
			/* ~52 */
			// U+00B7: "·" MIDDLE DOT
			/* 53 */ "!fixedColumnOrder!9,\u00B7,\",\',#,-,:,!,\\,,?,@,&,\\%,+,;,/,(,)",
			/* 54~ */
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
			null, null, null, null, null, null, null, null, null,
			/* ~107 */
			/* 108 */ "?,\u00B7",
			/* 109~ */
			null, null, null, null, null, null, null, null, null,
			/* ~117 */
			// U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
			/* 118 */ "\u00E7",
	};		};

	/* Language cs: Czech */		/* Language cs: Czech */
	@@ -1254,6 +1272,11 @@ public final class KeyboardTextsSet {
	/* 109 */ "\"",		/* 109 */ "\"",
	/* 110 */ "\'",		/* 110 */ "\'",
	/* 111 */ "\'",		/* 111 */ "\'",
			/* 112~ */
			null, null, null, null, null, null,
			/* ~117 */
			// U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
			/* 118 */ "\u00F1",
	};		};

	/* Language et: Estonian */		/* Language et: Estonian */

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,12 @@
	U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE		U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
	U+010D: "č" LATIN SMALL LETTER C WITH CARON -->		U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
	<string name="more_keys_for_c">ç,ć,č</string>		<string name="more_keys_for_c">ç,ć,č</string>
	<!-- U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT		<!-- U+00B7: "·" MIDDLE DOT
	U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->		U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->
	<string name="more_keys_for_l">ŀ,ł</string>		<string name="more_keys_for_l">l·l,ł</string>
			<!-- U+00B7: "·" MIDDLE DOT -->
			<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,·,\",\',#,-,:,!,\\,,\?,\@,&,\\%,+,;,/,(,)"</string>
			<string name="more_keys_for_tablet_period">\?,·</string>
			<!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->
			<string name="keylabel_for_spanish_row2_10">ç</string>
	</resources>		</resources>

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,8 @@
	U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE		U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
	U+010D: "č" LATIN SMALL LETTER C WITH CARON -->		U+010D: "č" LATIN SMALL LETTER C WITH CARON -->
	<string name="more_keys_for_c">ç,ć,č</string>		<string name="more_keys_for_c">ç,ć,č</string>
			<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->
			<string name="keylabel_for_spanish_row2_10">ñ</string>
	<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK		<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK
	U+00BF: "¿" INVERTED QUESTION MARK -->		U+00BF: "¿" INVERTED QUESTION MARK -->
	<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,¡,\",\',#,-,:,!,\\,,\?,¿,\@,&,\\%,+,;,/,(,)"</string>		<string name="more_keys_for_punctuation">"!fixedColumnOrder!9,¡,\",\',#,-,:,!,\\,,\?,¿,\@,&,\\%,+,;,/,(,)"</string>