am 284e73bd: Merge "Show emoji key on PC layout"

* commit '284e73bd419779608e6b8c91dd0edde151d75a4d':
  Show emoji key on PC layout
main
Satoshi Kataoka 2013-09-18 22:26:52 -07:00 committed by Android Git Automerger
commit 0cd8b2038d
2 changed files with 6 additions and 6 deletions

View File

@ -53,7 +53,7 @@
latin:keyXPos="-9.0%p" latin:keyXPos="-9.0%p"
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
latin:backgroundType="functional" latin:backgroundType="functional"
latin:keyboardLayout="@xml/key_symbols_period" /> latin:keyboardLayout="@xml/key_f2" />
</default> </default>
</switch> </switch>
</Row> </Row>

View File

@ -51,13 +51,13 @@
latin:keyWidth="11.538%p" /> latin:keyWidth="11.538%p" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="42.310%p" /> latin:keyWidth="38.464%p" />
</case> </case>
<!-- languageSwitchKeyEnabled="false" --> <!-- languageSwitchKeyEnabled="false" -->
<default> <default>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="53.848%p" /> latin:keyWidth="50.002%p" />
</default> </default>
</switch> </switch>
<Key <Key
@ -71,9 +71,9 @@
</case> </case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" --> <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default> <default>
<include <Key
latin:keyboardLayout="@xml/key_symbols_period" latin:keyStyle="emojiKeyStyle"
latin:backgroundType="functional" /> latin:keyWidth="fillRight" />
</default> </default>
</switch> </switch>
</Row> </Row>