From 6fe297a90539c42e4b4f573f8568f09ee511c8d1 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 21 Jan 2011 15:07:44 +0900
Subject: [PATCH] Use simple smiley for the emoticon key

This change uses keyLable to show simple smiley on the key top and
removes sym_keyboard_smiley_holo drawable.

Bug: 3350296
Change-Id: I7d28db8a6f74936f932f250a70991a1bd1ff4ddd
---
 .../drawable-mdpi/sym_keyboard_smiley_holo.png   | Bin 1260 -> 0 bytes
 java/res/xml-xlarge/kbd_key_styles.xml           |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 java/res/drawable-mdpi/sym_keyboard_smiley_holo.png

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 90a1272127f4200fe4681ede9cd467bd3afb33ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmbVMZEVzJ9PgN-Hyw~bq7Wms6D4NX_UY~VmODo8+G7{EId8|f1c!9(vt8Z#LfdgK
z1SN!Ed>LO1(L^#6!v}&1YUVI=pn!%zj0VJH5hIyX!{jA{81aLN`gFUSnk;;<N&CG0
zf4~3l|MK+Zj`j_W4XYY33~Nlc$yqeA=#AaK7=6Q6(&K1Y=_`4^)9&?)stYkmw|gL-
zHq}0ug{ofOaURAntiIRC<^6nSlc?DysRlM=$#f7Jk+qf_RqKa7-UIs#D^ARee@ftn
z9w)X$GjzsD!h+FOabahrJ*QRrH9;p@*Ws~}hzLyRt9Z#AuspF8CuVs?G!M2Z0-rVU
z`{Tr%sC=daPuecTqa+>HXqLuVK!QjM$8pU#Lj#(k8456Az=;t?q-nhR5XhUW_lj9L
zRrQ5daiZY+j!03(Vv#IHNZakBfFK9~2g8JsMc6A_zFG=fUQ>-hhMwjcj&Il&9x$ps
z_MjgpkkYvjOed3>C$_w5qEO1HlIl=^q$$%3;+nPg{4D%O#)8&fuIxZ63q5<#)lfZp
zn`&T`ySqCI43Qe~Y1cqSQ3qsO8#JNir{y?-PDtI*MTX;ODI!QMfQhg?K;gF}B}ouy
zJ_Q7>1=Khe!UCBW5)p}|Sw0GYLMH@;QvjFbQoI5H$JVfE%kx!BgEhYf@>|75?}`<Z
zE>wNn&Dr)qtphp=wr_g{+rg8aQ9Pq+h83)X^2|jmL)X{|^^|Ly_-uYfV*&pufo5gE
zCK5b@Bmls3Af<p*LZZ2Zz(*9Kiq-#5&L|{?3Yz0z%~IP!9T-gKTOTdvFAucPjd9V{
z_<HR2RSc_pBrQw1(&ZbMPlwLXE6(2TI&u5~e=j+CPxtznsqX1T?H9%;zn%I%^!fNy
z_e0Z*$d2Xb9^04bY%^E=xjHu7w*JM(%l887JGKG5y7mHAzxct2>FuZX)Xh)4x1Rkb
zom=x%W9UxT$z`KUZmu2POeye_&z8Ki?db168#fM3ygzi&bVl}c4_$fVC3e%HHFqXI
z+7<fv$i&v0g-UCz>)Kbpj9!29025j|J>2})t(B{v+4bYev-~R~`*x3>pE!6}OH|4$
zX0AQDxqknKpPnzg7TS2<3m4D)W)0O{n)%{OclWwmV_c~D($053$Uk><+ty=m50uVH
xJ3fr<A3HuWdi{@OzrI)ZAH{RhU%&d~DQx%v)wJ=*4^IUDpS030A4_cC`!@)dt?K{)

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" />