am 6e7dcd75: Merge "Use simple smiley for the emoticon key" into honeycomb

* commit '6e7dcd755eb4292b0b92cbba8237174b6317da05':
  Use simple smiley for the emoticon key
main
Tadashi G. Takaoka 2011-01-20 22:21:52 -08:00 committed by Android Git Automerger
commit d47237aed2
2 changed files with 4 additions and 4 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -60,8 +60,8 @@
latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style <key-style
latin:styleName="smileyKeyStyle" latin:styleName="smileyKeyStyle"
latin:keyIcon="@drawable/sym_keyboard_smiley_holo" latin:keyLabel=":-)"
latin:keyOutputText=";-) " latin:keyOutputText=":-) "
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" /> latin:maxPopupKeyboardColumn="5" />
@ -114,8 +114,8 @@
latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style <key-style
latin:styleName="smileyKeyStyle" latin:styleName="smileyKeyStyle"
latin:keyLabel=";-)" latin:keyLabel=":-)"
latin:keyOutputText=";-) " latin:keyOutputText=":-) "
latin:keyHintIcon="@drawable/hint_popup_holo" latin:keyHintIcon="@drawable/hint_popup_holo"
latin:popupCharacters="@string/alternates_for_smiley" latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" /> latin:maxPopupKeyboardColumn="5" />