diff options
| author |   The Android Open Source Project <initial-contribution@android.com> | 2012-07-31 07:52:42 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-07-31 07:52:42 -0700 |
| commit | df3f09c2e7fab17fe39b52fc9da99ac6da3647dc (patch) | |
| tree | 789823bd0d618e5b70f32d1682b414f0631a6950 /java/res/xml-sw768dp | |
| parent | be3eebf774a9a443eb9dc895d26e3157c98b210e (diff) | |
| parent | 8ec8c5fedac52352a4086fd05922fa57466b4dee (diff) | |
| download | latinime-df3f09c2e7fab17fe39b52fc9da99ac6da3647dc.tar.gz latinime-df3f09c2e7fab17fe39b52fc9da99ac6da3647dc.tar.xz latinime-df3f09c2e7fab17fe39b52fc9da99ac6da3647dc.zip | |
Sync with jb-mr1-dev
Change-Id: I6bc4664468cb2f0b3c55e42859b5fe86231a1b2f
Diffstat (limited to 'java/res/xml-sw768dp')
| -rw-r--r-- | java/res/xml-sw768dp/key_space.xml | 25 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/key_styles_common.xml | 8 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/rows_east_slavic.xml | 3 |
3 files changed, 31 insertions, 5 deletions
diff --git a/java/res/xml-sw768dp/key_space.xml b/java/res/xml-sw768dp/key_space.xml index 8968f080a..58e71d807 100644 --- a/java/res/xml-sw768dp/key_space.xml +++ b/java/res/xml-sw768dp/key_space.xml @@ -24,15 +24,36 @@ <switch> <case latin:languageCode="fa" + latin:languageSwitchKeyEnabled="true" + > + <Key + latin:keyStyle="languageSwitchKeyStyle" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="24.141%p" /> + <Key + latin:keyStyle="zwnjKeyStyle" /> + </case> + <case + latin:languageCode="fa" + latin:languageSwitchKeyEnabled="false" > <Key latin:keyStyle="spaceKeyStyle" latin:keyWidth="32.188%p" /> - <!-- U+200C: "" ZERO WIDTH NON-JOINER - U+200D: "" ZERO WIDTH JOINER --> <Key latin:keyStyle="zwnjKeyStyle" /> </case> + <case + latin:languageSwitchKeyEnabled="true" + > + <Key + latin:keyStyle="languageSwitchKeyStyle" /> + <Key + latin:keyStyle="spaceKeyStyle" + latin:keyWidth="32.188%p" /> + </case> + <!-- languageSwitchKeyEnabled="false" --> <default> <Key latin:keyStyle="spaceKeyStyle" diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml index 7afe5848a..537e76800 100644 --- a/java/res/xml-sw768dp/key_styles_common.xml +++ b/java/res/xml-sw768dp/key_styles_common.xml @@ -76,7 +76,7 @@ <key-style latin:styleName="spaceKeyStyle" latin:code="!code/key_space" - latin:keyActionFlags="noKeyPreview" /> + latin:keyActionFlags="noKeyPreview|enableLongPress" /> <!-- U+200C: ZERO WIDTH NON-JOINER U+200D: ZERO WIDTH JOINER --> <key-style @@ -100,6 +100,12 @@ latin:keyActionFlags="noKeyPreview" latin:backgroundType="functional" /> <key-style + latin:styleName="languageSwitchKeyStyle" + latin:code="!code/key_language_switch" + latin:keyIcon="!icon/language_switch_key" + latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress" + latin:altCode="!code/key_space" /> + <key-style latin:styleName="settingsKeyStyle" latin:code="!code/key_settings" latin:keyIcon="!icon/settings_key" diff --git a/java/res/xml-sw768dp/rows_east_slavic.xml b/java/res/xml-sw768dp/rows_east_slavic.xml index 0316c76f6..a4287f162 100644 --- a/java/res/xml-sw768dp/rows_east_slavic.xml +++ b/java/res/xml-sw768dp/rows_east_slavic.xml @@ -33,9 +33,8 @@ <include latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> <Key - latin:keyLabel="ъ" /> + latin:keyLabel="!text/keylabel_for_east_slavic_row1_12" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> |