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
main
Tadashi G. Takaoka 2014-02-24 05:57:27 -08:00 committed by Android Git Automerger
commit d7e008c0f9
1 changed files with 3 additions and 13 deletions

View File

@ -64,18 +64,8 @@
latin:keyStyle="defaultEnterKeyStyle" latin:keyStyle="defaultEnterKeyStyle"
latin:keySpec="!icon/enter_key|!code/key_enter" latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyWidth="15.384%p" /> latin:keyWidth="15.384%p" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Spacer />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key <Key
latin:keyStyle="emojiKeyStyle" latin:keyStyle="emojiKeyStyle"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</default>
</switch>
</Row> </Row>
</merge> </merge>