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

resolved conflicts for merge of ac777128 to master 

Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
main
Tadashi G. Takaoka 2010-10-16 04:57:53 +09:00
parent 93b3d50041 ac7771280d
commit 1dac5d491f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/res/xml/kbd_phone.xml
View File

@ -41,6 +41,7 @@
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
@ -57,6 +58,7 @@
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
@ -75,6 +77,7 @@
latin:keyIcon="@drawable/sym_keyboard_delete" latin:keyIcon="@drawable/sym_keyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:isRepeatable="true" latin:isRepeatable="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -84,7 +87,8 @@
<Key <Key
latin:codes="@integer/key_symbol" latin:codes="@integer/key_symbol"
latin:keyIcon="@drawable/sym_keyboard_numalt" latin:keyIcon="@drawable/sym_keyboard_numalt"
latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" /> latin:iconPreview="@drawable/sym_keyboard_feedback_numalt"
latin:keyEdgeFlags="left" />
<Key <Key
latin:codes="48" latin:codes="48"
latin:keyIcon="@drawable/sym_keyboard_num0" /> latin:keyIcon="@drawable/sym_keyboard_num0" />
@ -96,6 +100,7 @@
latin:codes="@integer/key_return" latin:codes="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return" latin:keyIcon="@drawable/sym_keyboard_return"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</Keyboard> </Keyboard>

4
java/res/xml/kbd_phone_symbols.xml
View File

@ -38,6 +38,7 @@
<Key <Key
latin:keyLabel="-" latin:keyLabel="-"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
@ -54,6 +55,7 @@
<Key <Key
latin:keyLabel="." latin:keyLabel="."
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
<Row> <Row>
@ -73,6 +75,7 @@
latin:keyIcon="@drawable/sym_keyboard_delete" latin:keyIcon="@drawable/sym_keyboard_delete"
latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:isRepeatable="true" latin:isRepeatable="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
@ -93,6 +96,7 @@
latin:codes="@integer/key_return" latin:codes="@integer/key_return"
latin:keyIcon="@drawable/sym_keyboard_return" latin:keyIcon="@drawable/sym_keyboard_return"
latin:keyWidth="20%p" latin:keyWidth="20%p"
latin:isModifier="true"
latin:keyEdgeFlags="right" /> latin:keyEdgeFlags="right" />
</Row> </Row>
</Keyboard> </Keyboard>