Merge "Revised Russian keyboard layout"

This commit is contained in:
Tadashi G. Takaoka 2011-02-20 01:08:30 -08:00 committed by Android (Google) Code Review
commit 810a9ff9d4
4 changed files with 231 additions and 74 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -31,23 +31,22 @@
latin:keyStyle="settingsKeyStyle" /> latin:keyStyle="settingsKeyStyle" />
<switch> <switch>
<case <case
latin:mode="email" latin:languageCode="ru"
> >
<Key
latin:keyStyle="comKeyStyle" />
<Key
latin:keyLabel="\@" />
</case>
<!-- TODO: implement logical OR for <case> attribute -->
<case
latin:mode="url"
>
<Key
latin:keyStyle="comKeyStyle"
latin:keyWidth="16.084%p" />
</case>
<default>
<switch> <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 <case
latin:imeAction="actionSearch" latin:imeAction="actionSearch"
> >
@ -63,12 +62,84 @@
latin:keyStyle="smileyKeyStyle" /> latin:keyStyle="smileyKeyStyle" />
</default> </default>
</switch> </switch>
<Key <switch>
latin:keyLabel="/" <case
latin:manualTemporaryUpperCaseCode="64" latin:mode="email"
latin:keyHintIcon="@drawable/key_hint_at_holo" >
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo" <Key
latin:popupCharacters="\@" /> latin:keyLabel="\@" />
</case>
<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"
>
<Key
latin:keyStyle="comKeyStyle"
latin:keyWidth="16.084%p" />
</case>
<default>
<switch>
<case
latin:mode="email"
>
<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>
<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>
</default>
</switch>
</default> </default>
</switch> </switch>
<Key <Key
@ -76,44 +147,95 @@
latin:keyWidth="37.454%p" /> latin:keyWidth="37.454%p" />
<switch> <switch>
<case <case
latin:mode="email" latin:languageCode="ru"
> >
<Key <switch>
latin:keyLabel="-" /> <case
</case> latin:mode="email"
<case >
latin:mode="url" <Key
> latin:keyLabel="-" />
<Key </case>
latin:keyLabel="/" <case
latin:manualTemporaryUpperCaseCode="58" latin:mode="url"
latin:keyHintIcon="@drawable/key_hint_colon_holo" >
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo" <Key
latin:popupCharacters=":" /> 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> </case>
<!-- not languageCode="ru" -->
<default> <default>
<Key <switch>
latin:keyLabel="\'" <case
latin:manualTemporaryUpperCaseCode="34" latin:mode="email"
latin:keyHintIcon="@drawable/key_hint_quote_holo" >
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo" <Key
latin:popupCharacters="&quot;" /> latin:keyLabel="-" />
</default> </case>
</switch> <case
<switch> latin:mode="url"
<case >
latin:mode="email" <Key
> latin:keyLabel="/"
<Key latin:manualTemporaryUpperCaseCode="58"
latin:keyLabel="_" /> latin:keyHintIcon="@drawable/key_hint_colon_holo"
</case> latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
<default> latin:popupCharacters=":" />
<Key </case>
latin:keyLabel="-" <default>
latin:manualTemporaryUpperCaseCode="95" <Key
latin:keyHintIcon="@drawable/key_hint_underline_holo" latin:keyLabel="\'"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo" latin:manualTemporaryUpperCaseCode="34"
latin:popupCharacters="_" /> latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
latin:popupCharacters="&quot;" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_" />
</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>
</default> </default>
</switch> </switch>
<switch> <switch>

View File

@ -105,11 +105,11 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.042%p" latin:keyWidth="7.520%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="15.192%p" latin:keyWidth="12.400%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="я" /> latin:keyLabel="я" />
@ -130,9 +130,15 @@
latin:keyLabel="б" /> latin:keyLabel="б" />
<Key <Key
latin:keyLabel="ю" /> 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 <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.530%p" latin:keyWidth="12.400%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<include <include

View File

@ -129,16 +129,33 @@
latin:keyLabel=":" /> latin:keyLabel=":" />
<Key <Key
latin:keyLabel=";" /> latin:keyLabel=";" />
<Key <switch>
latin:keyLabel="," /> <case
<Key latin:languageCode="ru"
latin:keyLabel="." /> >
<Key <Key
latin:keyLabel="!" latin:keyLabel="\'" />
latin:popupCharacters="¡" /> <Key
<Key latin:keyLabel="&quot;"
latin:keyLabel="\?" latin:popupCharacters="“,”,«,»,˝" />
latin:popupCharacters="¿" /> <Key
latin:keyLabel="." />
<Key
latin:keyLabel="," />
</case>
<default>
<Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
<Key
latin:keyLabel="!"
latin:popupCharacters="¡" />
<Key
latin:keyLabel="\?"
latin:popupCharacters="¿" />
</default>
</switch>
<Key <Key
latin:keyStyle="moreKeyStyle" latin:keyStyle="moreKeyStyle"
latin:keyWidth="12.530%p" latin:keyWidth="12.530%p"
@ -159,11 +176,23 @@
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="37.454%p" /> latin:keyWidth="37.454%p" />
<Key <switch>
latin:keyLabel="&quot;" <case
latin:popupCharacters="“,”,«,»,˝" /> latin:languageCode="ru"
<Key >
latin:keyLabel="_" /> <Key
latin:keyLabel="_" />
<Key
latin:keyLabel="-" />
</case>
<default>
<Key
latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»,˝" />
<Key
latin:keyLabel="_" />
</default>
</switch>
<switch> <switch>
<case <case
latin:voiceKeyEnabled="true" latin:voiceKeyEnabled="true"