aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-06-06 10:51:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-06 10:51:07 -0700
commitbaad1d162ca0c0c59eafe82cb3babeb4e2fcc95e (patch)
treec6076c702ec9024f89d1730a5aaf7dff7884a08a /java
parent91c8c4f3a7a6c624f156fd1862525a2dadf062c3 (diff)
parent5562874831219d5622b5d194fd3ee3e15251202d (diff)
downloadlatinime-baad1d162ca0c0c59eafe82cb3babeb4e2fcc95e.tar.gz
latinime-baad1d162ca0c0c59eafe82cb3babeb4e2fcc95e.tar.xz
latinime-baad1d162ca0c0c59eafe82cb3babeb4e2fcc95e.zip
am 55628748: am 95ab6fff: Merge "Change spacebar and language switch key background color of phone" into jb-dev
* commit '5562874831219d5622b5d194fd3ee3e15251202d': Change spacebar and language switch key background color of phone
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/key_styles_common.xml9
-rw-r--r--java/res/xml/row_qwerty4.xml5
2 files changed, 5 insertions, 9 deletions
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 819cdc6a9..622da2120 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -105,8 +105,7 @@
<key-style
latin:styleName="spaceKeyStyle"
latin:code="!code/key_space"
- latin:keyActionFlags="noKeyPreview|enableLongPress"
- latin:backgroundType="functional" />
+ latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
<key-style
@@ -115,8 +114,7 @@
latin:keyIcon="!icon/zwnj_key"
latin:moreKeys="!icon/zwj_key|&#x200D;"
latin:keyLabelFlags="hasPopupHint"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="functional" />
+ latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="!code/key_shortcut"
@@ -137,8 +135,7 @@
latin:code="!code/key_language_switch"
latin:keyIcon="!icon/language_switch_key"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
- latin:altCode="!code/key_space"
- latin:backgroundType="functional" />
+ latin:altCode="!code/key_space" />
<key-style
latin:styleName="tabKeyStyle"
latin:code="!code/key_tab"
diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
index ecb95e7a5..43385d291 100644
--- a/java/res/xml/row_qwerty4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -38,15 +38,14 @@
>
<!-- U+064B: "ً" ARABIC FATHATAN -->
<Key
- latin:keyLabel="."
latin:keyHintLabel="&#x064B;"
latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
- latin:backgroundType="functional" />
+ latin:keyStyle="punctuationKeyStyle" />
</case>
<default>
<Key
- latin:keyStyle="punctuationKeyStyle" />
+ latin:keyStyle="punctuationKeyStyle" />
</default>
</switch>
<Key