Skip to content
Snippets Groups Projects
Commit f7f2e82e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Make Russian layout for 7 inch table compatible with other locale"

parents 348dea0c 0ad80871
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
java/res/xml-sw600dp/kbd_qwerty_row4.xml
+ 37
− 90
View file @ f7f2e82e
...@@ -59,99 +59,46 @@ ...@@ -59,99 +59,46 @@
latin:keyWidth="39.750%p" /> latin:keyWidth="39.750%p" />
<switch> <switch>
<case <case
latin:languageCode="ru" latin:mode="email"
>
<Key
latin:keyLabel="-"
latin:keyWidth="9.750%p" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="&quot;"
latin:popupCharacters="&quot;"
latin:keyWidth="9.750%p" />
</default>
</switch>
<switch>
<case
latin:mode="email"
> >
<switch> <Key
<case latin:keyLabel="_"
latin:mode="email" latin:keyWidth="9.750%p" />
>
<Key
latin:keyLabel="-"
latin:keyWidth="9.750%p" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="\?"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="!"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\'"
latin:popupCharacters="\'"
latin:keyWidth="9.750%p" />
</default>
</switch>
</case> </case>
<!-- not languageCode="ru" -->
<default> <default>
<switch> <Key
<case latin:keyLabel="-"
latin:mode="email" latin:keyLabelOption="hasUppercaseLetter"
> latin:keyHintLabel="_"
<Key latin:popupCharacters="_"
latin:keyLabel="-" latin:keyWidth="9.750%p" />
latin:keyWidth="9.750%p" />
</case>
<case
latin:mode="url"
>
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="&quot;"
latin:popupCharacters="&quot;"
latin:keyWidth="9.750%p" />
</default>
</switch>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyLabel="_"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default>
</switch>
</default> </default>
</switch> </switch>
<Spacer <Spacer
......
java/res/xml-sw600dp/kbd_rows_russian.xml
+ 28
− 11
View file @ f7f2e82e
...@@ -24,12 +24,11 @@ ...@@ -24,12 +24,11 @@
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<Row <Row
latin:keyWidth="8.0%p" latin:keyWidth="7.60%p"
latin:rowEdgeFlags="top" latin:rowEdgeFlags="top"
> >
<Key <Key
latin:keyLabel="й" latin:keyLabel="й"
latin:keyXPos="2.15%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ц" /> latin:keyLabel="ц" />
...@@ -52,6 +51,8 @@ ...@@ -52,6 +51,8 @@
latin:keyLabel="з" /> latin:keyLabel="з" />
<Key <Key
latin:keyLabel="х" /> latin:keyLabel="х" />
<Key
latin:keyLabel="ъ" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-10.0%p"
...@@ -59,11 +60,11 @@ ...@@ -59,11 +60,11 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.0%p" latin:keyWidth="7.60%p"
> >
<Key <Key
latin:keyLabel="ф" latin:keyLabel="ф"
latin:keyEdgeFlags="left" /> latin:keyXPos="2.25%p" />
<Key <Key
latin:keyLabel="ы" /> latin:keyLabel="ы" />
<Key <Key
...@@ -91,11 +92,10 @@ ...@@ -91,11 +92,10 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.0%p" latin:keyWidth="7.60%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="я" /> latin:keyLabel="я" />
...@@ -116,11 +116,28 @@ ...@@ -116,11 +116,28 @@
latin:keyLabel="б" /> latin:keyLabel="б" />
<Key <Key
latin:keyLabel="ю" /> latin:keyLabel="ю" />
<Key <switch>
latin:keyLabel="." <case
latin:keyLabelOption="hasUppercaseLetter" latin:mode="email"
latin:keyHintLabel="," >
latin:popupCharacters="," /> <Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />
</case>
<default>
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
<include <include
latin:keyboardLayout="@xml/kbd_row3_right" /> latin:keyboardLayout="@xml/kbd_row3_right" />
</Row> </Row>
......
java/res/xml-sw600dp/kbd_symbols.xml
+ 17
− 58
View file @ f7f2e82e
...@@ -113,12 +113,6 @@ ...@@ -113,12 +113,6 @@
latin:keyLabel="=" latin:keyLabel="="
latin:popupCharacters="≠,≈" /> latin:popupCharacters="≠,≈" />
<switch> <switch>
<case
latin:languageCode="ru"
>
<Key
latin:keyLabel=":" />
</case>
<case <case
latin:mode="url" latin:mode="url"
> >
...@@ -133,37 +127,16 @@ ...@@ -133,37 +127,16 @@
</switch> </switch>
<Key <Key
latin:keyLabel=";" /> latin:keyLabel=";" />
<switch> <Key
<case latin:keyLabel="," />
latin:languageCode="ru" <Key
> latin:keyLabel="." />
<Key <Key
latin:keyLabel="\'" latin:keyLabel="!"
latin:popupCharacters="‘,’,‚,‛" /> latin:popupCharacters="¡" />
<!-- Note: DroidSans doesn't have double-high-reversed-quotation <Key
'\u201f' glyph. --> latin:keyLabel="\?"
<!-- latin:popupCharacters="“,”,„,‟,«,»" --> latin:popupCharacters="¿" />
<Key
latin:keyLabel="&quot;"
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:keyLabel="/" latin:keyLabel="/"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
...@@ -185,30 +158,16 @@ ...@@ -185,30 +158,16 @@
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyXPos="30.750%p" latin:keyXPos="30.750%p"
latin:keyWidth="39.750%p" /> latin:keyWidth="39.750%p" />
<switch>
<case
latin:languageCode="ru"
>
<Key
latin:keyLabel="_"
latin:keyWidth="9.750%p" />
<Key
latin:keyLabel="-"
latin:keyWidth="9.750%p" />
</case>
<default>
<!-- Note: DroidSans doesn't have double-high-reversed-quotation <!-- Note: DroidSans doesn't have double-high-reversed-quotation
'\u201f' glyph. --> '\u201f' glyph. -->
<!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" --> <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&quot;"
latin:popupCharacters="“,”,«,»,‘,’,‚,‛" latin:popupCharacters="“,”,«,»,‘,’,‚,‛"
latin:keyWidth="9.750%p" /> latin:keyWidth="9.750%p" />
<Key <Key
latin:keyLabel="_" latin:keyLabel="_"
latin:keyWidth="9.750%p" /> latin:keyWidth="9.750%p" />
</default>
</switch>
<Spacer <Spacer
latin:keyXPos="-10.00%p" latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" /> latin:keyWidth="0%p" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment