diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-10-16 04:57:53 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2010-10-16 04:57:53 +0900 |
| commit | 1dac5d491f11885b2fceae177f6bdfa94346b3a6 (patch) | |
| tree | 7cec0e718ac7692e8dd684fc32579ea32687765b /java | |
| parent | 93b3d500410388869d7e0606955453f1a9569088 (diff) | |
| parent | ac7771280d04a2bcea2dda8c7fe5a7b4f2e4c264 (diff) | |
| download | latinime-1dac5d491f11885b2fceae177f6bdfa94346b3a6.tar.gz latinime-1dac5d491f11885b2fceae177f6bdfa94346b3a6.tar.xz latinime-1dac5d491f11885b2fceae177f6bdfa94346b3a6.zip | |
resolved conflicts for merge of ac777128 to master
Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/kbd_phone.xml | 7 | ||||
| -rw-r--r-- | java/res/xml/kbd_phone_symbols.xml | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml index e036cd6d9..dc88e2b24 100644 --- a/java/res/xml/kbd_phone.xml +++ b/java/res/xml/kbd_phone.xml @@ -41,6 +41,7 @@ <Key latin:keyLabel="-" latin:keyWidth="20%p" + latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -57,6 +58,7 @@ <Key latin:keyLabel="." latin:keyWidth="20%p" + latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -75,6 +77,7 @@ latin:keyIcon="@drawable/sym_keyboard_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:keyWidth="20%p" + latin:isModifier="true" latin:isRepeatable="true" latin:keyEdgeFlags="right" /> </Row> @@ -84,7 +87,8 @@ <Key latin:codes="@integer/key_symbol" latin:keyIcon="@drawable/sym_keyboard_numalt" - latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" /> + latin:iconPreview="@drawable/sym_keyboard_feedback_numalt" + latin:keyEdgeFlags="left" /> <Key latin:codes="48" latin:keyIcon="@drawable/sym_keyboard_num0" /> @@ -96,6 +100,7 @@ latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" latin:keyWidth="20%p" + latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml index 09146e7af..1400d3670 100644 --- a/java/res/xml/kbd_phone_symbols.xml +++ b/java/res/xml/kbd_phone_symbols.xml @@ -38,6 +38,7 @@ <Key latin:keyLabel="-" latin:keyWidth="20%p" + latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -54,6 +55,7 @@ <Key latin:keyLabel="." latin:keyWidth="20%p" + latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> <Row> @@ -73,6 +75,7 @@ latin:keyIcon="@drawable/sym_keyboard_delete" latin:iconPreview="@drawable/sym_keyboard_feedback_delete" latin:keyWidth="20%p" + latin:isModifier="true" latin:isRepeatable="true" latin:keyEdgeFlags="right" /> </Row> @@ -93,6 +96,7 @@ latin:codes="@integer/key_return" latin:keyIcon="@drawable/sym_keyboard_return" latin:keyWidth="20%p" + latin:isModifier="true" latin:keyEdgeFlags="right" /> </Row> </Keyboard> |