am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keys (1b985607) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/xml-sw600dp/keys_pcqwerty3_right2.xml

+2 −22

Original line number	Diff line number	Diff line
		@@ -28,19 +28,9 @@
		<Key
		latin:keyLabel=";"
		latin:moreKeys=":" />
		<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
		U+2019: "’" RIGHT SINGLE QUOTATION MARK
		U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
		U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
		U+201C: "“" LEFT DOUBLE QUOTATION MARK
		U+201D: "”" RIGHT DOUBLE QUOTATION MARK
		U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
		U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.
		moreKeys="!fixedColumnOrder!4,“,”,„,‟,‘,’,‚,‛" -->
		<Key
		latin:keyLabel="\'"
		latin:moreKeys="!fixedColumnOrder!4,“,”,‘,’,‚,‛,"" />
		latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
		</case>
		<default>
		<Key
		@@ -48,20 +38,10 @@
		latin:keyHintLabel=":"
		latin:moreKeys=":"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
		U+2019: "’" RIGHT SINGLE QUOTATION MARK
		U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
		U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
		U+201C: "“" LEFT DOUBLE QUOTATION MARK
		U+201D: "”" RIGHT DOUBLE QUOTATION MARK
		U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
		U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.
		moreKeys="!fixedColumnOrder!4,“,”,„,‟,‘,’,‚,‛" -->
		<Key
		latin:keyLabel="\'"
		latin:keyHintLabel="""
		latin:moreKeys="!fixedColumnOrder!4,“,”,‘,’,‚,‛,""
		latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,",!text/single_quotes"
		latin:keyStyle="hasShiftedLetterHintStyle" />
		</default>
		</switch>

java/res/xml/keys_pcqwerty3_right2.xml

+2 −12

Original line number	Diff line number	Diff line
		@@ -30,25 +30,15 @@
		latin:moreKeys=":" />
		<Key
		latin:keyLabel="\'"
		latin:moreKeys=""" />
		latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,",!text/single_quotes" />
		</case>
		<!-- keyboardLayoutSetElement="alphabetShifted\|symbols" -->
		<default>
		<Key
		latin:keyLabel=":" />
		<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
		U+2019: "’" RIGHT SINGLE QUOTATION MARK
		U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
		U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
		U+201C: "“" LEFT DOUBLE QUOTATION MARK
		U+201D: "”" RIGHT DOUBLE QUOTATION MARK
		U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
		U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.
		moreKeys="!fixedColumnOrder!4,“,”,„,‟,‘,’,‚,‛" -->
		<Key
		latin:keyLabel="""
		latin:moreKeys="!fixedColumnOrder!4,“,”,‘,’,‚,‛" />
		latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
		</default>
		</switch>
		</merge>

java/res/xml/row_symbols_shift4.xml

+3 −5

Original line number	Diff line number	Diff line
		@@ -27,13 +27,11 @@
		<Key
		latin:keyStyle="toAlphaKeyStyle"
		latin:keyWidth="15%p" />
		<!-- U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
		<!-- latin:keyLabelFlags="hasPopupHint" -->
		<!-- latin:moreKeys="‟" -->
		<!-- U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
		<!-- U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
		U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->
		<Key
		latin:keyLabel="„"
		latin:moreKeys="‚"
		latin:backgroundType="functional" />
		<include
		latin:keyXPos="25%p"

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

+540 −440

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −23

Original line number	Diff line number	Diff line
		@@ -99,31 +99,11 @@
		U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
		U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
		U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
		U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
		The following characters don't need BIDI mirroring.
		U+2018: "‘" LEFT SINGLE QUOTATION MARK
		U+2019: "’" RIGHT SINGLE QUOTATION MARK
		U+201A: "‚" SINGLE LOW-9 QUOTATION MARK
		U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK
		U+201C: "“" LEFT DOUBLE QUOTATION MARK
		U+201D: "”" RIGHT DOUBLE QUOTATION MARK
		U+201E: "„" DOUBLE LOW-9 QUOTATION MARK
		U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK -->
		<string name="more_keys_for_less_than">!fixedColumnOrder!3,‹\|›,≤\|≥,«\|»</string>
		<string name="more_keys_for_greater_than">!fixedColumnOrder!3,›\|‹,≥\|≤,»\|«</string>
		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		<!-- <string name="more_keys_for_double_quote">“,”,„,‟,«\|»,»\|«</string> -->
		<string name="more_keys_for_double_quote">!fixedColumnOrder!4,“,”,«\|»,»\|«</string>
		<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->
		<!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,“,”,„,‟,«\|»,&#x00BB\|«;,‘,’,‚,‛</string> -->
		<string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,“,”,«\|»,»\|«,‘,’,‚,‛</string>
		<!-- U+00A2: "¢" CENT SIGN
		U+00A3: "£" POUND SIGN
		U+20AC: "€" EURO SIGN
		U+00A5: "¥" YEN SIGN
		U+20B1: "₱" PESO SIGN
		U+FDFC: "﷼" RIAL SIGN -->
		<string name="more_keys_for_currency_dollar">¢,£,€,¥,₱,﷼</string>
		<string name="single_angle_quotes">!text/single_laqm_raqm_rtl</string>
		<string name="double_angle_quotes">!text/double_laqm_raqm_rtl</string>
		<!-- U+0655: "ٕ" ARABIC HAMZA BELOW
		U+0654: "ٔ" ARABIC HAMZA ABOVE
		U+0652: "ْ" ARABIC SUKUN