From b127d882854d81a47473b344a1e5f277866bbf22 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Mon, 5 Aug 2013 18:21:55 +0900 Subject: [PATCH] Add emoji icon and code as a groundwork The emoji switching key icon asset should be updated. The icons in this change are just borrowed from Hangout. Bug: 10179862 Bug: 6370846 Change-Id: Icea26d2cf2ac6a6df9beb4c98f646dbe309bdcd9 --- java/res/drawable-hdpi/ic_emoji_dark.png | Bin 0 -> 1858 bytes java/res/drawable-hdpi/ic_emoji_light.png | Bin 0 -> 1820 bytes java/res/drawable-mdpi/ic_emoji_dark.png | Bin 0 -> 1182 bytes java/res/drawable-mdpi/ic_emoji_light.png | Bin 0 -> 1132 bytes java/res/drawable-xhdpi/ic_emoji_dark.png | Bin 0 -> 2631 bytes java/res/drawable-xhdpi/ic_emoji_light.png | Bin 0 -> 2526 bytes java/res/values/attrs.xml | 1 + java/res/values/keyboard-icons-black.xml | 1 + java/res/values/keyboard-icons-ics.xml | 1 + java/res/values/keyboard-icons-white.xml | 1 + java/res/xml-sw600dp/key_styles_common.xml | 5 +++++ java/res/xml-sw600dp/rows_10_10_7_symbols.xml | 2 +- java/res/xml-sw768dp/key_styles_common.xml | 5 +++++ java/res/xml/key_styles_common.xml | 5 +++++ .../keyboard/internal/KeyboardCodesSet.java | 3 +++ .../keyboard/internal/KeyboardIconsSet.java | 1 + .../com/android/inputmethod/latin/Constants.java | 2 ++ .../com/android/inputmethod/latin/LatinIME.java | 3 +++ 18 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 java/res/drawable-hdpi/ic_emoji_dark.png create mode 100644 java/res/drawable-hdpi/ic_emoji_light.png create mode 100644 java/res/drawable-mdpi/ic_emoji_dark.png create mode 100644 java/res/drawable-mdpi/ic_emoji_light.png create mode 100644 java/res/drawable-xhdpi/ic_emoji_dark.png create mode 100644 java/res/drawable-xhdpi/ic_emoji_light.png diff --git a/java/res/drawable-hdpi/ic_emoji_dark.png b/java/res/drawable-hdpi/ic_emoji_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f18cde0917dbc68ee210b3b8abc8037d9f486e GIT binary patch literal 1858 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 AaR2}S literal 0 HcmV?d00001 diff --git a/java/res/drawable-mdpi/ic_emoji_dark.png b/java/res/drawable-mdpi/ic_emoji_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d0047a437431c29c1962b1ab9dae363b9f3a5fb2 GIT binary patch literal 1182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F_88EW4Dvpb_@*6d7dtgArXh)PCxB0;wW&eels_l$)1Bp z5^aBYomjL&@?qYGi5ZK+|9d=k)K|%{S$(s+gOS;ZDQ)7@g$l|CV~;t9Cf>F-Uh{Fq zTpy#$SN~qU9vUD1{lNZvO<`=Vfm6)vP9F4P(3*PczMx0poQmS^U-vvVZgo+a+VJ?s zF^LNE0yzurFO2G2{xjTQ3v1{<;CJdyh>|ah(VTL|#}1LVEcgi1J8}%=y?Ta<(NNr_^CC_TBgguad<-3RxSrc%kKy8 z0(Oaud#>)8y8U(W6mNB=eRsp6gVzWyxc;lRMsPvYTA{W?$KKQjbByi>PvSISv2hWJ zV=g;vz;no8%ZoXIzcn^IJKNj1+M_mtnQN+->PO{-huSL>vf{QJ6Da+zHACBK%lh!+ zF(04hX{4Q8lqy)@nxXjm^1*MpN2X2e3TK}-$8z1?b;;9g&p4-WfBzZv(KW*5hfBm&Pv|Sanzyx*NSw(6WNW-IXl0;eSNO_64wg<1q&75lvszp)O(P~ z74~R<_3bYz8`j$eaZ0?-b@5;=6>$liqVUR&_s@Zq3p7=32`)WvHG}o&onx27X0J8q zQhFWZ+IPp1H`6gvyg~ZJw^K?NE=={S?A|o_)7-Dma}TSsYE>_s>(~+&B4qd>cK!`T zv-cL8!j9dx&1^j(@m^WHKXC2?u_>WT6nJ0WamZB{XkD+cJpQidLxCc(Gm7q&3@Txc zo68PrKandCu6V?7?8Hfnra9B@TGg>f1gP^KubiDEqmdT;nRA9i*~I3@j0NGvSqD0~ za>7{Im3+KcTI#>LBlKa)l-m~rx%QYuXl-lAKcQ*XqhVdrCJQYQT95t$$Oz$!@oTS!G@_@=@K+g>GUov)n7cBe!~V6 zOhXLKtc(qH;3=?}V2}ja5S*V@Ql40p%HWui hpOmWLnVXoN8kCxtQdxL16;w_zc)I$ztaD0e0sxzH@uvU) literal 0 HcmV?d00001 diff --git a/java/res/drawable-mdpi/ic_emoji_light.png b/java/res/drawable-mdpi/ic_emoji_light.png new file mode 100644 index 0000000000000000000000000000000000000000..a3195041a03c7c4c05e89aaee277b41b06858f8d GIT binary patch literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F_88EW4Dvpb_@*6Hl8kyArXh)PWSbn>?m-&-ane>2Um!1 zhy{m>AgkUfafe=Y{O!jbzN$4PIe1(+5^(QIK<}1Veq-n9iNCj0UG<&! zrLwH-|L6JB=iWTD-)@tiSgSzLYiGVNh7+5F=!ih#xQX{HE-B`Af5I0DMfiRz1JbWs6yh>gk$*^Bg^<^Fv>BBPpuGhGWf|l^(@2lyZ2m=?zz(wH--7s zu^P*UIiI^eUt^hcckh9eB?qSXtXjjCE>yW$yBWG*jK^SLU>tf}EIl5qGW!#(#S+7s{Cgs|=kbzdvmxM!m4 z0oF@X3zVz)=QdO^m6j%+S4{DoA+cfN0j_^{zfOI8!2jw*m4r3r6I`@bEb=jaW;N;V zZa2?g{j#bnL5(DcCOoR-ndtWsdQ_}HObVupK>p+ zjNB0MD|yE%hvaixKYJ_^o$4a`W1+vP(l!yzO@?jOwkw@d*4+$seeCfu^McK~;uA|B zt4zA6TDz+>Pxj@kwz~m6oT}Th<2E`y*`0W&M=tZsJgsVG9i`M#mYs@?cN(Tmt+0)X zW|C8Q{@?H->r&Ci87*5MtM;yBbp9+-^74IM%GQ(J9@hK3{H*iJ6(!lS-wrE0XpsjO83Qzt&o3g5IdY+AX~f#*j=3VdUCFTHo;a;f^2 zSDV^i$$seCzjMm72@E^6d6Z+m$^_8|*-827*FViEcyMRl#WhQ|w!BIB zEC1i{WkZMh&_ARz?Q82If`<25z~rA5k>q=BH$)RpQoQZtxVC=@}$JHU#IVm6RtIr7}3C h98?L2a#hr^g0tc zLq$w^eH&P0RXsQ3;^sT0Qk8f zv8Mqb0s#PD{Q&@V2LLofvl2*|SGc{bQ6%c)ucpb<7uBr@u$vW8?sXEdW;_P6(cHc3+V%E0wTI%;#D^L0ytZ6}gS(H7dvY&Ec zH$|b0SU+e4D%*Fx>HWM!7U+m>@FHA%NNwfZF$J^^tBo_0r@wJ65nwp7|yWFYl%TpdUq`^H#Yn>t=`^mP_|%e$MI})UXgmtwREy>2`a#kkpwUx1q4%SiW~&^mFf4Dd?TNy6-`$N;o!wd-6S4H%3K#P3KCg zUo7!&=?|(TPy&dEo?j&wEShQX0`efz?xvuWyeq-FB@z=;)IA*5&Yh)PJ~C`4B)Wi( zNZGs!Mr$a9e!g$OTX@S^eZI1}{_&Z7lu#vgwMsh^Sa8~O=OM3S$^C;^M_C1N{g(*r zdZEjOPUX#nqfT_xy+LX6RvWY6tEf$BMSS*syUeglA0K24S2i^4F%lX(oJpw2i>u$d zuT!&%MNHwBey(J)SZTzH+g-6X@t5BW@wlSMCIj9!gd+rI?1+q=ba**?zNA_vv#sD6 zX5$ZYG^ct1%e;b6@U%8vQc}5%t|WmS$DWQ=lR2SFHUW<@pEWMW^kwR~sRVqqGqp-Q zJDLK|8A0MlO{bLxOQCHwkWlE>)5P5~NpUqD-r!cuVyj+uj+;T$BYy|?dwMnA`K~^M z*RATn!7a2tV_%Q*WGSk*Vb=%fS38bgz8dj_{UxJTZJskFQDElPJ&f~IrGmGaf&Nkk zlumo`A!xXV5Vo8XU}HTcZ8tF10~gE+zbOW(7Rt{>AH=%q$qPCyvCVI!+Pa$$yp}rp zO4*I}Jpvx-pS0g#$4~LDxy42eqxKzxyV7;*_R7qn4%GABat4UUUjcN(BmXRf^=fwW zN2yvX#R2W7gPFp^rx)) zPM~B(*HmBU>@%F2UmIgki)ugdU<;5k&8$^;m=^90B2|wlibamxTUXR&G!vU#CnKT*^<%z_vpEfHOCtqOXBNt*Duhc`w=f9SU3d4Q|MOK7FWOn2yH2`U z1G`mb zw{bb|eWY@29D4VBsQ^M`**$pzkvijZaoTPV)w&-HX7a!>%K6e+Cb`z$LnpX}Sv%BN z6r8c*|8mP7dKACP{){xt9db^Mfx#hKh#}%Yt?pCorh#h~PABuf92Cah`hMiq_NfP# zE$YA8jy8lOW$E`1$2=^)N;sy+mtcbg^uE!LIv+FE4viNHrk^~tO=~CRKb&geuDJ__ ze!!`17W(Gz+;11txW)Z~^F|p<#`Ix7L&`7t@X5*BHHRP1Z}+2o)BTEfO!q@5d!-v2 zt=}DOCEQ(Lspb+ zPwMR{ZyjGsI$XP8E*MNo!P<|a%G&Uk#WDBeeMFG+%0niC_ER39!P39S<|0>rAt;29 zOB9mC;>H_$s?rudHv7rzIs3oww=eFjjVPSRfkRtWxOd+`Yr7;buzYm|c?XV93~2kl zl(e8s^!zucMkf;7vD;EMOpFiB?`N${N@Ornr+m9t;!ZD<)u*?oKql>1K5ZR**4pz8 z38*M%bk{F?AO1I|T>K~7LL!62hLN^1%r9?brS0Kv$HS@Q@IVyhT;K)(R*2o!<_H^e zD_fu4b|~xJC@X|H0*OK(+?l5q|Hr@#p)!Kb|9=A#@o6K^0os2q91aNzk0PH71kluw ffIxjblS~UF1d^%eSzUpD0v&*N^TL*6{1g8RFoUZl literal 0 HcmV?d00001 diff --git a/java/res/drawable-xhdpi/ic_emoji_light.png b/java/res/drawable-xhdpi/ic_emoji_light.png new file mode 100644 index 0000000000000000000000000000000000000000..21bc9090dcae1ea475dd21cf98b2610c7795c884 GIT binary patch literal 2526 zcmZ`*c{J1u8~)AMhHTkGcWj|D*{_{u8Z#ryAe1HhWSws?glsd&QX`Vc5-vi7M7Au$ zm8D3^(j79oX>7?LW4aSQ-T%HnzVn{-f!ykrmB_1K>-$spwm;(T$ z(FzH7ilJ>3a|j+UC5J7d4PJzY)?|uTe|^|gHm9rcN4Wo;25#J} z3t05Hye>}|U>Im2O^PjtHuQm>aGj; zY4AAGWRmzN&;i5?Jb4rndQ&x263|xWkcUZVp;Qgut`KZmmHAV8k41ZLhlK%S0$c{X zwu{Th70;w)0vJ}8E*(?~E=9icRKpOtuJH8oN|D!D=GR*JenL9<3$U0R*2lFzDrfv>B`fT6S`Wt znpmk_9UB2CDd%xo z4bYK@Iwyy1K@rC;_=Gr$tNx z0TV587>&O(>@f1NK_+{W5yVo=Lw=E@&w_!vzsJNWblke;1(s;;&+%GNtsrd_#WRxRKY$r0gdX!vxXz1lRi? z_`B>Nub0e7$tiedGh(rGJ57a6R zH3yS8p6n6mB3U%s3D<I0`vgiC$@I@($ zmXjK)-M7dqA3w0A8n*VLWOJ0GiWJ%3RR=jAx*5d-(N+iaw$7!i;%AoCc@!L%cLV=U z%vHP-5B)1ENH5!TC)r*m@5dMQ92zc?K8RS+SzOoi&d}IYL|n8PuX=wm%X-;%n-6=l z$IaQbDk%4u#+*MF!r%GjQa9-Sxo+3E_n`b8(>{l7bMtihfA*s8xqucYOE}*^0+(K} z;)?D^ZJR=A21%&L#QZUXRhEp>bRrKAGP=$CZ=@+W-53vGy@B^yA6Ge!|c~9O_+>0!AcbM-E@?$gNB29y)L-A zI)v*KFNVV(qEQWJWQO2#TEllmLhvQCfJ0Vcn><%)=X@)qVIMvOYoZFgK4rs|wv&|5=tM}nL|Oc7-+ z!>79w=uH||PDh8c1bq{Auxo|LD$fXOl7HB0KJlgq_;jM2?<%2EoKdF|EPQgjNiM5Q z)H%B@xk5m#&M~w;g%hot}#-nRfavwNH&g;9}z}nRVrSR#+ zu|S&%wUENI(!+sEdlJS8omrIe;vxUS$nGS~x>=~@LcgY2)xb(cB#XER&8zAgozJd_ znB&boIK5bwIudRTFlTrUk}tZ*vAQot7&{@+%)*hdSHl zS=fva{Q3Uac`>GxqHziOF5L(5Mg8mpW$Z$1TU-B1L$l6wmZnWis}UB`wh;Wf8%wK| z^vE$J->KR!|NeX3ewj7n&3omRG*ZFUoEYwhC&pxU%$82S(P}s*#xrR0%Cl+DY!>dq zQLZLhGNeaVI;*2{CQWRuM+s6SnN+_O1^=|Li19$;|i2b4JC3x&H6?nkZde3tUc_k^E0klfa&UzLp>$E|WxnnNO1;=}t%9|E#3 z7s0=Ml`=N(vm5y$U1?-0-py%ztp-%>NFSF+lNVm;`Mu}FyMxq0DxNiV$;$M^rUP6x zNOYWkt~#lR7W8k1fJSmGFft*s-ZFgqM-k>!q~(=Jf1gO4v0nu42ml=|ZC#j_9!y8y zN&9zWU2S6>Etr;pv6dDJe|77B1bBjf(6!kAFEG&haul + diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml index e9c5733b5..c1b1b6573 100644 --- a/java/res/values/keyboard-icons-black.xml +++ b/java/res/values/keyboard-icons-black.xml @@ -39,5 +39,6 @@ @drawable/sym_keyboard_zwnj_holo @drawable/sym_keyboard_zwj_holo + @drawable/ic_emoji_light diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml index 8eba196de..5ada27ae8 100644 --- a/java/res/values/keyboard-icons-ics.xml +++ b/java/res/values/keyboard-icons-ics.xml @@ -36,5 +36,6 @@ @drawable/sym_keyboard_language_switch @drawable/sym_keyboard_zwnj_holo @drawable/sym_keyboard_zwj_holo + @drawable/ic_emoji_light diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml index e52099867..7c6de42fa 100644 --- a/java/res/values/keyboard-icons-white.xml +++ b/java/res/values/keyboard-icons-white.xml @@ -35,5 +35,6 @@ @drawable/sym_keyboard_zwnj_holo @drawable/sym_keyboard_zwj_holo + @drawable/ic_emoji_dark diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index a2d2fd827..f407ba346 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -119,6 +119,11 @@ latin:keyIcon="!icon/language_switch_key" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress" latin:altCode="!code/key_space" /> + - + +