aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-01-21 11:00:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-21 11:00:07 -0800
commit4a5e0248776dda5b7f5f68acae049b5ef3b77284 (patch)
tree60998c69158f1e40b8dd3243568313de88eaa2cb /java
parent9dc260ebbf419f6f2b18560be89ea206e328042a (diff)
parentd47237aed21db8aaa5b1bd9dc63f5c76b1925d6a (diff)
downloadlatinime-4a5e0248776dda5b7f5f68acae049b5ef3b77284.tar.gz
latinime-4a5e0248776dda5b7f5f68acae049b5ef3b77284.tar.xz
latinime-4a5e0248776dda5b7f5f68acae049b5ef3b77284.zip
am d47237ae: am 6e7dcd75: Merge "Use simple smiley for the emoticon key" into honeycomb
* commit 'd47237aed21db8aaa5b1bd9dc63f5c76b1925d6a': Use simple smiley for the emoticon key
Diffstat (limited to 'java')
-rw-r--r--java/res/drawable-mdpi/sym_keyboard_smiley_holo.pngbin1260 -> 0 bytes
-rw-r--r--java/res/xml-xlarge/kbd_key_styles.xml8
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
deleted file mode 100644
index 90a127212..000000000
--- a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png
+++ /dev/null
Binary files differ
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" />