nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix Serbian (Cyrillic) keyboard layout (DO NOT MERGE)" into honeycomb-mr2

Browse source
This commit is contained in:
Tadashi G. Takaoka 2011-05-18 23:40:42 -07:00 committed by Android (Google) Code Review
commit 24e6643fbc
3 changed files with 44 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
java/res/xml-large/kbd_sr_rows.xml
View file

@ -23,62 +23,61 @@
> >
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<!-- This row is intentionally not marked as a top row -->
<Row <Row
latin:keyWidth="7.520%p" latin:keyWidth="9.09%p"
latin:rowEdgeFlags="top"
> >
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyLabel="љ"
latin:keyLabelOption="alignLeft" latin:keyHintIcon="@drawable/keyboard_hint_1"
latin:keyWidth="7.949%p" latin:popupCharacters="1"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="љ"
latin:popupCharacters="1" />
<Key <Key
latin:keyLabel="њ" latin:keyLabel="њ"
latin:keyHintIcon="@drawable/keyboard_hint_2"
latin:popupCharacters="2" /> latin:popupCharacters="2" />
<Key <Key
latin:keyLabel="е" latin:keyLabel="е"
latin:keyHintIcon="@drawable/keyboard_hint_3"
latin:popupCharacters="3" /> latin:popupCharacters="3" />
<Key <Key
latin:keyLabel="р" latin:keyLabel="р"
latin:keyHintIcon="@drawable/keyboard_hint_4"
latin:popupCharacters="4" /> latin:popupCharacters="4" />
<Key <Key
latin:keyLabel="т" latin:keyLabel="т"
latin:keyHintIcon="@drawable/keyboard_hint_5"
latin:popupCharacters="5" /> latin:popupCharacters="5" />
<Key <Key
latin:keyLabel="з" latin:keyLabel="з"
latin:keyHintIcon="@drawable/keyboard_hint_6"
latin:popupCharacters="6" /> latin:popupCharacters="6" />
<Key <Key
latin:keyLabel="у" latin:keyLabel="у"
latin:keyHintIcon="@drawable/keyboard_hint_7"
latin:popupCharacters="7" /> latin:popupCharacters="7" />
<Key <Key
latin:keyLabel="и" latin:keyLabel="и"
latin:keyHintIcon="@drawable/keyboard_hint_8"
latin:popupCharacters="8" /> latin:popupCharacters="8" />
<Key <Key
latin:keyLabel="о" latin:keyLabel="о"
latin:keyHintIcon="@drawable/keyboard_hint_9"
latin:popupCharacters="9" /> latin:popupCharacters="9" />
<Key <Key
latin:keyLabel="п" latin:keyLabel="п"
latin:keyHintIcon="@drawable/keyboard_hint_0"
latin:popupCharacters="0" /> latin:popupCharacters="0" />
<Key <Key
latin:keyLabel="ш" /> latin:keyLabel="ш"
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="9.331%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.520%p" latin:keyWidth="9.09%p"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyLabel="а"
latin:keyLabelOption="alignLeft"
latin:keyWidth="7.949%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="а" />
<Key <Key
latin:keyLabel="с" /> latin:keyLabel="с" />
<Key <Key
@ -98,23 +97,17 @@
<Key <Key
latin:keyLabel="ч" /> latin:keyLabel="ч" />
<Key <Key
latin:keyLabel="ћ" /> latin:keyLabel="ћ"
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="9.331%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.520%p" latin:keyWidth="8.90%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.400%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ђ" /> latin:keyLabel="ѕ" />
<Key
latin:keyLabel="ж" />
<Key <Key
latin:keyLabel="џ" /> latin:keyLabel="џ" />
<Key <Key
@ -128,20 +121,12 @@
<Key <Key
latin:keyLabel="м" /> latin:keyLabel="м" />
<Key <Key
latin:keyLabel="," latin:keyLabel="ђ" />
latin:manualTemporaryUpperCaseCode="33"
latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
latin:popupCharacters="!" />
<Key <Key
latin:keyLabel="." latin:keyLabel="ж" />
latin:manualTemporaryUpperCaseCode="63"
latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
latin:popupCharacters="\?" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="12.400%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<include <include

20
java/res/xml-xlarge/kbd_sr_rows.xml
View file

@ -30,7 +30,7 @@
<Key <Key
latin:keyStyle="tabKeyStyle" latin:keyStyle="tabKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.949%p" latin:keyWidth="8.640%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="љ" latin:keyLabel="љ"
@ -66,7 +66,7 @@
latin:keyLabel="ш" /> latin:keyLabel="ш" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="9.331%p" latin:keyWidth="8.640%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
@ -75,7 +75,7 @@
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="7.949%p" latin:keyWidth="8.640%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="а" /> latin:keyLabel="а" />
@ -101,7 +101,7 @@
latin:keyLabel="ћ" /> latin:keyLabel="ћ" />
<Key <Key
latin:keyStyle="returnKeyStyle" latin:keyStyle="returnKeyStyle"
latin:keyWidth="9.331%p" latin:keyWidth="8.640%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
@ -109,12 +109,10 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.400%p" latin:keyWidth="8.640%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ђ" /> latin:keyLabel="ѕ" />
<Key
latin:keyLabel="ж" />
<Key <Key
latin:keyLabel="џ" /> latin:keyLabel="џ" />
<Key <Key
@ -127,6 +125,10 @@
latin:keyLabel="н" /> latin:keyLabel="н" />
<Key <Key
latin:keyLabel="м" /> latin:keyLabel="м" />
<Key
latin:keyLabel="ђ" />
<Key
latin:keyLabel="ж" />
<Key <Key
latin:keyLabel="," latin:keyLabel=","
latin:manualTemporaryUpperCaseCode="33" latin:manualTemporaryUpperCaseCode="33"
@ -141,7 +143,7 @@
latin:popupCharacters="\?" /> latin:popupCharacters="\?" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="12.400%p" latin:keyWidth="8.640%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<include <include

17
java/res/xml/kbd_sr_rows.xml
View file

@ -73,7 +73,7 @@
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.333%p" latin:keyWidth="9.09%p"
> >
<Key <Key
latin:keyLabel="а" latin:keyLabel="а"
@ -97,20 +97,17 @@
<Key <Key
latin:keyLabel="ч" /> latin:keyLabel="ч" />
<Key <Key
latin:keyLabel="ћ" /> latin:keyLabel="ћ"
<Key
latin:keyLabel="ђ"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row <Row
latin:keyWidth="8.5%p" latin:keyWidth="8.90%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="11.75%p"
latin:keyEdgeFlags="left" /> latin:keyEdgeFlags="left" />
<Key <Key
latin:keyLabel="ж" /> latin:keyLabel="ѕ" />
<Key <Key
latin:keyLabel="џ" /> latin:keyLabel="џ" />
<Key <Key
@ -123,9 +120,13 @@
latin:keyLabel="н" /> latin:keyLabel="н" />
<Key <Key
latin:keyLabel="м" /> latin:keyLabel="м" />
<Key
latin:keyLabel="ђ" />
<Key
latin:keyLabel="ж" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="11.75%p" latin:keyWidth="11.00%p"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<include <include