aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-24 05:57:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-24 05:57:27 -0800
commitd7e008c0f9e18be879b6a77cba2827fb4ccac2f0 (patch)
tree5f434357bb2467bc7bab17c70b26b677f77c12f3
parent03347d8dc12740434e02ee3e516b4e131e824388 (diff)
parent7446232c0c5bfd1b440e977e3c2bb1f9031b5b36 (diff)
downloadlatinime-d7e008c0f9e18be879b6a77cba2827fb4ccac2f0.tar.gz
latinime-d7e008c0f9e18be879b6a77cba2827fb4ccac2f0.tar.xz
latinime-d7e008c0f9e18be879b6a77cba2827fb4ccac2f0.zip
am 7446232c: Merge "Show emoji key both main and shift PC Qwerty keyboard"
* commit '7446232c0c5bfd1b440e977e3c2bb1f9031b5b36': Show emoji key both main and shift PC Qwerty keyboard
-rw-r--r--java/res/xml/row_pcqwerty5.xml16
1 files changed, 3 insertions, 13 deletions
diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml
index a72f38880..f6438ab0f 100644
--- a/java/res/xml/row_pcqwerty5.xml
+++ b/java/res/xml/row_pcqwerty5.xml
@@ -64,18 +64,8 @@
latin:keyStyle="defaultEnterKeyStyle"
latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyWidth="15.384%p" />
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
- >
- <Spacer />
- </case>
- <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
- <default>
- <Key
- latin:keyStyle="emojiKeyStyle"
- latin:keyWidth="fillRight" />
- </default>
- </switch>
+ <Key
+ latin:keyStyle="emojiKeyStyle"
+ latin:keyWidth="fillRight" />
</Row>
</merge>