diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-11 03:06:33 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 03:06:33 -0700 |
| commit | 2de0b52a035ac27ffcddb0e914135f2ac104e05f (patch) | |
| tree | 9e8b4c65b3231a829eba08a3d47e38aeee6f0926 /java/res | |
| parent | 6792a909cd0da3db6a957cb2576b4d08f46a53b7 (diff) | |
| parent | ef6dadbe6c54738f39632c7fec57d31efffb2362 (diff) | |
| download | latinime-2de0b52a035ac27ffcddb0e914135f2ac104e05f.tar.gz latinime-2de0b52a035ac27ffcddb0e914135f2ac104e05f.tar.xz latinime-2de0b52a035ac27ffcddb0e914135f2ac104e05f.zip | |
Merge "Reorganize punctuations and diacritics of Arabic and Persian" into jb-dev
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/xml-sw600dp/key_dash.xml | 16 | ||||
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/row_qwerty4.xml | 19 |
3 files changed, 30 insertions, 6 deletions
diff --git a/java/res/xml-sw600dp/key_dash.xml b/java/res/xml-sw600dp/key_dash.xml index a7c3727da..f7e0b3436 100644 --- a/java/res/xml-sw600dp/key_dash.xml +++ b/java/res/xml-sw600dp/key_dash.xml @@ -28,11 +28,21 @@ <Key latin:keyLabel="_" /> </case> + <case + latin:languageCode="ar|fa" + > + <!-- U+064B: "ً" ARABIC FATHATAN --> + <Key + latin:keyLabel="." + latin:keyHintLabel="ً" + latin:moreKeys="!text/more_keys_for_arabic_diacritics" + latin:keyStyle="hasShiftedLetterHintStyle" /> + </case> <default> <Key - latin:keyLabel="!text/keylabel_for_dash" - latin:keyHintLabel="!text/keyhintlabel_for_dash" - latin:moreKeys="!text/more_keys_for_dash" + latin:keyLabel="-" + latin:keyHintLabel="_" + latin:moreKeys="_" latin:keyStyle="hasShiftedLetterHintStyle" /> </default> </switch> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 6b64985a6..819cdc6a9 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -201,7 +201,6 @@ <key-style latin:styleName="punctuationKeyStyle" latin:keyLabel="." - latin:keyHintLabel="!text/keyhintlabel_for_punctuation" latin:keyLabelFlags="hasPopupHint" latin:moreKeys="!text/more_keys_for_punctuation" latin:backgroundType="functional" /> diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index 678034960..ecb95e7a5 100644 --- a/java/res/xml/row_qwerty4.xml +++ b/java/res/xml/row_qwerty4.xml @@ -32,8 +32,23 @@ <include latin:keyXPos="25%p" latin:keyboardLayout="@xml/key_space" /> - <Key - latin:keyStyle="punctuationKeyStyle" /> + <switch> + <case + latin:languageCode="ar|fa" + > + <!-- U+064B: "ً" ARABIC FATHATAN --> + <Key + latin:keyLabel="." + latin:keyHintLabel="ً" + latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint" + latin:moreKeys="!text/more_keys_for_arabic_diacritics" + latin:backgroundType="functional" /> + </case> + <default> + <Key + latin:keyStyle="punctuationKeyStyle" /> + </default> + </switch> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" /> |