diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-01-20 22:21:52 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-01-20 22:21:52 -0800 |
| commit | d47237aed21db8aaa5b1bd9dc63f5c76b1925d6a (patch) | |
| tree | 60998c69158f1e40b8dd3243568313de88eaa2cb | |
| parent | b14fc8822bd288f337a677a9a6fa8d3d1c8a0950 (diff) | |
| parent | 6e7dcd755eb4292b0b92cbba8237174b6317da05 (diff) | |
| download | latinime-d47237aed21db8aaa5b1bd9dc63f5c76b1925d6a.tar.gz latinime-d47237aed21db8aaa5b1bd9dc63f5c76b1925d6a.tar.xz latinime-d47237aed21db8aaa5b1bd9dc63f5c76b1925d6a.zip | |
am 6e7dcd75: Merge "Use simple smiley for the emoticon key" into honeycomb
* commit '6e7dcd755eb4292b0b92cbba8237174b6317da05':
Use simple smiley for the emoticon key
| -rw-r--r-- | java/res/drawable-mdpi/sym_keyboard_smiley_holo.png | bin | 1260 -> 0 bytes | |||
| -rw-r--r-- | java/res/xml-xlarge/kbd_key_styles.xml | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png Binary files differdeleted file mode 100644 index 90a127212..000000000 --- a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png +++ /dev/null diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml index 26659a2ad..d211e5e61 100644 --- a/java/res/xml-xlarge/kbd_key_styles.xml +++ b/java/res/xml-xlarge/kbd_key_styles.xml @@ -60,8 +60,8 @@ latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" - latin:keyIcon="@drawable/sym_keyboard_smiley_holo" - latin:keyOutputText=";-) " + latin:keyLabel=":-)" + latin:keyOutputText=":-) " latin:keyHintIcon="@drawable/hint_popup_holo" latin:popupCharacters="@string/alternates_for_smiley" latin:maxPopupKeyboardColumn="5" /> @@ -114,8 +114,8 @@ latin:iconPreview="@drawable/sym_keyboard_feedback_space" /> <key-style latin:styleName="smileyKeyStyle" - latin:keyLabel=";-)" - latin:keyOutputText=";-) " + latin:keyLabel=":-)" + latin:keyOutputText=":-) " latin:keyHintIcon="@drawable/hint_popup_holo" latin:popupCharacters="@string/alternates_for_smiley" latin:maxPopupKeyboardColumn="5" /> |
