diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-07-31 00:43:21 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-07-31 00:43:22 -0700 |
| commit | 71c472ed8c8383df6c63bf9136812e7197f416bd (patch) | |
| tree | c60c953998e22933cdf656f2ef06110aa89b0f4a /java | |
| parent | 6492a2f31df8e8c5ee70ca4b4269c9d03ed5f492 (diff) | |
| parent | f6235167b75ea096eef2485c13890be469a05df0 (diff) | |
| download | latinime-71c472ed8c8383df6c63bf9136812e7197f416bd.tar.gz latinime-71c472ed8c8383df6c63bf9136812e7197f416bd.tar.xz latinime-71c472ed8c8383df6c63bf9136812e7197f416bd.zip | |
Merge "Add language switch key to 10" tablet" into jb-mr1-dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw768dp/key_space.xml | 25 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/key_styles_common.xml | 8 |
2 files changed, 30 insertions, 3 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" |