diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-06-06 10:48:40 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-06-06 10:48:40 -0700 |
| commit | 5562874831219d5622b5d194fd3ee3e15251202d (patch) | |
| tree | 8159fad91892d366e891f24f8cb924d0827f07b6 /java | |
| parent | e08cfda1ebea693c56681816076c419f23c51076 (diff) | |
| parent | 95ab6fff29b83434307a1705bfe68d30bf440237 (diff) | |
| download | latinime-5562874831219d5622b5d194fd3ee3e15251202d.tar.gz latinime-5562874831219d5622b5d194fd3ee3e15251202d.tar.xz latinime-5562874831219d5622b5d194fd3ee3e15251202d.zip | |
am 95ab6fff: Merge "Change spacebar and language switch key background color of phone" into jb-dev
* commit '95ab6fff29b83434307a1705bfe68d30bf440237':
Change spacebar and language switch key background color of phone
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/key_styles_common.xml | 9 | ||||
| -rw-r--r-- | java/res/xml/row_qwerty4.xml | 5 |
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|‍" 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="ً" 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 |