Merge "Revised Russian keyboard layout" (810a9ff9) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/drawable-mdpi/key_hint_comma_large_holo.9.png

0 → 100644

+1.17 KiB

Loading image diff...

java/res/xml-xlarge/kbd_qwerty_row4.xml

+178 −56

Original line number	Diff line number	Diff line
		@@ -30,15 +30,68 @@
		<Key
		latin:keyStyle="settingsKeyStyle" />
		<switch>
		<case
		latin:languageCode="ru"
		>
		<switch>
		<!-- TODO: implement logical OR for <case> attribute -->
		<case
		latin:mode="email"
		>
		<Key
		latin:keyStyle="comKeyStyle" />
		</case>
		<case
		latin:mode="url"
		>
		<Key
		latin:keyStyle="comKeyStyle" />
		</case>
		<case
		latin:imeAction="actionSearch"
		>
		<Key
		latin:keyLabel=":"
		latin:manualTemporaryUpperCaseCode="43"
		latin:keyHintIcon="@drawable/key_hint_plus_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
		latin:popupCharacters="+" />
		</case>
		<default>
		<Key
		latin:keyStyle="smileyKeyStyle" />
		</default>
		</switch>
		<switch>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="\@" />
		</case>
		<!-- TODO: implement logical OR for <case> attribute -->
		<case
		latin:mode="url"
		>
		<Key
		latin:keyLabel="-"
		latin:manualTemporaryUpperCaseCode="95"
		latin:keyHintIcon="@drawable/key_hint_underline_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
		latin:popupCharacters="_" />
		</case>
		<default>
		<Key
		latin:keyLabel="/"
		latin:manualTemporaryUpperCaseCode="64"
		latin:keyHintIcon="@drawable/key_hint_at_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
		latin:popupCharacters="\@" />
		</default>
		</switch>
		</case>
		<!-- not languageCode="ru" -->
		<default>
		<switch>
		<case
		latin:mode="url"
		>
		@@ -48,6 +101,12 @@
		</case>
		<default>
		<switch>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyStyle="comKeyStyle" />
		</case>
		<case
		latin:imeAction="actionSearch"
		>
		@@ -63,6 +122,14 @@
		latin:keyStyle="smileyKeyStyle" />
		</default>
		</switch>
		<switch>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="\@" />
		</case>
		<default>
		<Key
		latin:keyLabel="/"
		latin:manualTemporaryUpperCaseCode="64"
		@@ -71,9 +138,62 @@
		latin:popupCharacters="\@" />
		</default>
		</switch>
		</default>
		</switch>
		</default>
		</switch>
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="37.454%p" />
		<switch>
		<case
		latin:languageCode="ru"
		>
		<switch>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="-" />
		</case>
		<case
		latin:mode="url"
		>
		<Key
		latin:keyLabel="/"
		latin:manualTemporaryUpperCaseCode="58"
		latin:keyHintIcon="@drawable/key_hint_colon_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
		latin:popupCharacters=":" />
		</case>
		<default>
		<Key
		latin:keyLabel="\?"
		latin:manualTemporaryUpperCaseCode="95"
		latin:keyHintIcon="@drawable/key_hint_underline_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
		latin:popupCharacters="_" />
		</default>
		</switch>
		<switch>
		<case
		latin:mode="email"
		>
		<Key
		latin:keyLabel="_" />
		</case>
		<default>
		<Key
		latin:keyLabel="!"
		latin:manualTemporaryUpperCaseCode="39"
		latin:keyHintIcon="@drawable/key_hint_quote_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
		latin:popupCharacters="\'" />
		</default>
		</switch>
		</case>
		<!-- not languageCode="ru" -->
		<default>
		<switch>
		<case
		latin:mode="email"
		@@ -116,6 +236,8 @@
		latin:popupCharacters="_" />
		</default>
		</switch>
		</default>
		</switch>
		<switch>
		<case
		latin:voiceKeyEnabled="true"

java/res/xml-xlarge/kbd_ru_rows.xml

+9 −3

Original line number	Diff line number	Diff line
		@@ -105,11 +105,11 @@
		latin:keyEdgeFlags="right" />
		</Row>
		<Row
		latin:keyWidth="8.042%p"
		latin:keyWidth="7.520%p"
		>
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="15.192%p"
		latin:keyWidth="12.400%p"
		latin:keyEdgeFlags="left" />
		<Key
		latin:keyLabel="я" />
		@@ -130,9 +130,15 @@
		latin:keyLabel="б" />
		<Key
		latin:keyLabel="ю" />
		<Key
		latin:keyLabel="."
		latin:manualTemporaryUpperCaseCode="44"
		latin:keyHintIcon="@drawable/key_hint_comma_holo"
		latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_comma_large_holo"
		latin:popupCharacters="," />
		<Key
		latin:keyStyle="shiftKeyStyle"
		latin:keyWidth="12.530%p"
		latin:keyWidth="12.400%p"
		latin:keyEdgeFlags="right" />
		</Row>
		<include

java/res/xml-xlarge/kbd_symbols.xml

+44 −15

Original line number	Diff line number	Diff line
		@@ -129,6 +129,21 @@
		latin:keyLabel=":" />
		<Key
		latin:keyLabel=";" />
		<switch>
		<case
		latin:languageCode="ru"
		>
		<Key
		latin:keyLabel="\'" />
		<Key
		latin:keyLabel="""
		latin:popupCharacters="“,”,«,»,˝" />
		<Key
		latin:keyLabel="." />
		<Key
		latin:keyLabel="," />
		</case>
		<default>
		<Key
		latin:keyLabel="," />
		<Key
		@@ -139,6 +154,8 @@
		<Key
		latin:keyLabel="\?"
		latin:popupCharacters="¿" />
		</default>
		</switch>
		<Key
		latin:keyStyle="moreKeyStyle"
		latin:keyWidth="12.530%p"
		@@ -159,11 +176,23 @@
		<Key
		latin:keyStyle="spaceKeyStyle"
		latin:keyWidth="37.454%p" />
		<switch>
		<case
		latin:languageCode="ru"
		>
		<Key
		latin:keyLabel="_" />
		<Key
		latin:keyLabel="-" />
		</case>
		<default>
		<Key
		latin:keyLabel="""
		latin:popupCharacters="“,”,«,»,˝" />
		<Key
		latin:keyLabel="_" />
		</default>
		</switch>
		<switch>
		<case
		latin:voiceKeyEnabled="true"