From 39390d3f948fecc68d6c9a107bb372e62e55ce0d Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 23 Mar 2012 19:14:32 +0900 Subject: [PATCH] Add ZWNJ and ZWJ icons Bug: 5456620 Change-Id: I7238f41c841803746ca2ab6cd332b2be8498a3ee --- java/res/drawable-hdpi/sym_keyboard_zwj_holo.png | Bin 0 -> 973 bytes .../res/drawable-hdpi/sym_keyboard_zwnj_holo.png | Bin 0 -> 961 bytes java/res/drawable-mdpi/sym_keyboard_zwj_holo.png | Bin 0 -> 733 bytes .../res/drawable-mdpi/sym_keyboard_zwnj_holo.png | Bin 0 -> 704 bytes .../res/drawable-xhdpi/sym_keyboard_zwj_holo.png | Bin 0 -> 1185 bytes .../drawable-xhdpi/sym_keyboard_zwnj_holo.png | Bin 0 -> 1148 bytes java/res/values/attrs.xml | 4 ++++ java/res/values/keyboard-icons-black.xml | 3 +++ java/res/values/keyboard-icons-ics.xml | 2 ++ java/res/values/keyboard-icons-white.xml | 3 +++ java/res/xml-sw600dp/key_styles_common.xml | 9 ++++++--- java/res/xml-sw768dp/key_styles_common.xml | 9 ++++++--- java/res/xml/key_styles_common.xml | 10 ++++++---- .../keyboard/internal/KeyboardIconsSet.java | 4 +++- 14 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 java/res/drawable-hdpi/sym_keyboard_zwj_holo.png create mode 100644 java/res/drawable-hdpi/sym_keyboard_zwnj_holo.png create mode 100644 java/res/drawable-mdpi/sym_keyboard_zwj_holo.png create mode 100644 java/res/drawable-mdpi/sym_keyboard_zwnj_holo.png create mode 100644 java/res/drawable-xhdpi/sym_keyboard_zwj_holo.png create mode 100644 java/res/drawable-xhdpi/sym_keyboard_zwnj_holo.png diff --git a/java/res/drawable-hdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-hdpi/sym_keyboard_zwj_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..5fa30ceb8275ad300485b440fcfd419e86190c7c GIT binary patch literal 973 zcmeAS@N?(olHy`uVBq!ia0vp^N|H(?D8gCb5m^kRJ;2!QWVRgx1Jhhj7srr@!*^%w&lYtQIBq}Nd)^{X zF2k<1t}LvM92yawD}JxpCKKPSTHWg*tU_DwGrXHMr|eUn4%f6fT$xqdg@YyuFpAts;kom#AzRwP zbL~vC#<_;qMZb0PyPupKB!A-3p43xrIukVJ+>FzGuz|fuxPo;KL)8<#Q;S{(87Q*Y z?^0~(n}7Qt@640$7?(F(KVZu5av<^n^9Kftlrx2ej;ky5Guym1^S_xKeHd zgAG$y<5EYB8%@=xR_0z`KWSR7vP$Z@3qKc`t7qOl7V}B(UV7R6NhPtDzNf4g^>m(T zy2y^rhV>qkc+NTCRIvzZGivV_4QP%|H9*Wu=&>^n(gJ#_5gP2i&_H zqi2Qexxn*-O^5mU$=J!3o2P3AXD|!R>$zk4yg~YaRP?+1Vkg*sezfJaF@7@hx&o&Q zqkZAutV7D`i@9wKZ}K;uUBtPq@4d8V_sNaiS|`_?{5WT_iM`VL>6Jm3RxPp%=D!=C^?0e8svSF7_sQ&$yRfUi+}*RF(7tV*>)`8Xd_eb8*n_$)r&R1VcxC&F z&Me*i<5H9{r$Rtbwi@da!7Qc|0c&T9OjsBd-1@36;b_$6_3K>!y_GlJ?O3Y&DD{uL z{pUJnz3GpyJH@>-2c}rn64!{5l*E!$tK_0oAjM#0U}&UkV61Co7-DE@Wng4wWT08-nxGO3D+9QW+dm@{>{(JaZG% ZQ-e|yQz{Ejrh>8+gQu&X%Q~loCIH0KgE0UA literal 0 HcmV?d00001 diff --git a/java/res/drawable-hdpi/sym_keyboard_zwnj_holo.png b/java/res/drawable-hdpi/sym_keyboard_zwnj_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..91367f3d2236e03099f9a9df2bacc95bf93161fb GIT binary patch literal 961 zcmeAS@N?(olHy`uVBq!ia0vp^N|H(?D8gCb5m^kRJ;2!QWVRgx1JguL7srr@!*^$F%)8eOCyVD=O;c9kxl{Gz$Fuod=IYpmX{Oz z#`^Yj7Pn33p5OiZ{C<6U`ZYci1J8f?9sS4oon~;q_ls11XssEz5p5jtC+h%|&I%xrt*=4~aA;j&L9i}@1k#0Tr5RWEgJ?GRrY+~UZmI$oXGZl`>v|+|Z z|HMC~EnK^g87BJ2AE${pnwVE_D`JZ@(}5+(v9~;}YZDY<#QJzgw&J2p@hIT`je-rYGe< z@B@Y)39n}d&aHJnAX(u0b(=3wcE%0%XWH7wPdGm?{vdcmXKni2uWwdyC&`!3e)f9u zPdVX}CnjI^z3m#JD)f`jhJ7A`yGZl4b4PNHGsrJ-fA)IjPrWtuTs4f_8pID6PPPe3 z<@|cQVTOAjZ}sV#rE)6gv^KZ#++deutX7MkDz(4x`PDAf8^&k;PFnxSV!CwG{jf>b zRBI=1dA)7@d+P~XUj6!Qx7)1juhg53{{z&FT|e>cVCQLwci>PAIo7lxc$+@ z#DJ+(wZt`|BqgyV)hf9t6-Y4{85kPr8W`&u8HN~|S{WEw85!ytm|GbbEK_o6MbVI( zpOTqYiLSxW%Fq;|!L1|Z6i|aC$cEtjw370~qErUQl>DSr1<%~X^wgl##FWaylc}Jr O#Ng@b=d#Wzp$P!mC5t=& literal 0 HcmV?d00001 diff --git a/java/res/drawable-mdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-mdpi/sym_keyboard_zwj_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..70370d83d3ae6de76979ce2fd6c64b24709bb2ce GIT binary patch literal 733 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6L!3HE_wj8emQY`6?zK#qG8~eHcB(ehejKx9j zP7LeL$-D$|6p}rHd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC0W`2+&aOZkpaffz zx4R3&e-K=-cll(X2xoyuWHFHT0Ash4*>*tV*Lu1*hIky`I?b>v#8IGaf1Q6hZ&-Qc zQ5O;6NQ0XpA2^ymva#Jea6nn7O2Cm>nN?pQ;{ofD2p%z3N7sOYXT~e#s;lOj-+d7l z^!MJC|KZo~hyG>ryKre2gQ>pz1DOw^GZ>ec@XAY>O-TOMp!}dpdt2+CJ3rlisJ&L) zuDoq_&D)=UxPS8ekldGRevvnMif#K-y^Ochl=3>X(pOe+7HBnGdk`A-AXwo1DIM{K z_5-R9!dZGHBUIy+)~@n$tdX=}*%nxS_53UGuk&_E9tioV{mS@jmJR<@`^ERd_ph9P zW%G*XSC#+Yi2fSpXmhN}zV3ei^Nk)g(Y4_Pd&0N3Ez(&e{jEX#z~nU!7j?Z)wXE@P ze12f-0sS9FKW+Y`HOMjYC+&R|viVs1fyWiw13xU)IelE?`O>Pzm#QKZPX`>m8xrq& zrhUy%*RQ=*>g5hEBAd5gWiEZLfATm}b$IRCcPd{?rhMKj)8P76cyHX+Ov{ew1N}BG z$JrL7HmFTH!+3gks^O)p5$TnEUn_S`WV&4Q-AC?)RnGghH&Sh%+`aaD=I{MxSD&j# zevNwl^ZumwKcDrV%zwS&l+bKpRaamPs+PD$l%ynI(3)EF2VS{N990fib~Fff!FFfhDIU|_JC0W`2+&aOZkpaffz zx4R3&e-K=-cll(X2xoyuWHFHT0Ash4*>*tVCwRIzhIky`I?d4Uu!Df>{ab-88XW2h zOFAYj=y+V^SQ+O|l5?)EcT5wnhKO_wtsiFWokhhAk~*SJqbWof=d&vo;d^A!h6 z#Q6JCqP;z*Pg)jr!B(WM!5##gtVQ0Mjx!Evm8EIv3!{^;}ydTy}VDjZfrbwCfaJ9QJ#1Od!BFp+UM$% z-n|uFJuP>oPJRBLsq>D{zBKXJqZ*jaY%iR$I&A3p3e~Da*Wcc9vMm16){`=i4oEQqBT2QyHKHUX zu_Vlzt`7@Arc7+Dz^>Kd3^85k^6a%n};kei>9nO2Fe!O+Uk z6r#bcBjprOgCxj?;QX|b^2DN42FH~Aq*MjZ+{EFVdQ&MBb@ E03&)91poj5 literal 0 HcmV?d00001 diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-xhdpi/sym_keyboard_zwj_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..26694274ea504e3522696af6fdc0a1cfd40928c7 GIT binary patch literal 1185 zcmeAS@N?(olHy`uVBq!ia0vp^xNn{1`8Hb>$hefcb*F;G0NkE^l%Z0=RCt^b$p@{XM=Z(-0MN;QUqb$G)u#$*P>=b^WE#F>lBI71zJ~D{Nw0;U%fZ8S9h% z;y+W##wS5syWIB*{yxrGr5nesezN4(gt1D{WS;SQhr=h<)WSLUyDzm~iy znZE0>%lnnz&o|9~Y@@&3_p9dDjW_l&?BJ}9tFc+Y`y( z-tc~M@7f!7>1B)WZhj^Gsy8Kh%8t7EtaC*l)`!gJGrrsHm*x;3`2EWI<&NeFo7e99 z)$=R3IeE%I{g!jeclf_gztS#cY{LDk`^xiMOfPD3mnq*ex#4`_^QDSDg`oEjjyIk@ z5Pg7oOaEcf0=WwI9V|Ado*bF1d^|)qxH{zJEoMIkeFpK#AI%;FwQqdB!uWIC2h;HG z1)nX~Gx;%vH>x*;2Sv}m63M8~B;JsHvTo|1vs={o%Fug-YPxg>oxw-v!ohJ=Y*@?6$vR;<|`xpT_>W_aX7Y+ppYCZV!I7 zGjr~=(pwF3E7Y$X?E1U>;QV0!Ll3L0)P*0;U%7NPbAr%Ax0#xG6J*lD*!YaM2HDDr z{^_6560a~<@G^7kzU42T98FGsbgU+Jf5`dBBHcArXmIODIR(@p39=zL rKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MJ2es9^AP^>bP0l+XkKae@a3 literal 0 HcmV?d00001 diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo.png b/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo.png new file mode 100644 index 0000000000000000000000000000000000000000..75a22b65faa13b3ae01598d7f4548b411b9e326b GIT binary patch literal 1148 zcmeAS@N?(olHy`uVBq!ia0vp^xNn{1`8Hb zyXTY6>9jvQ_fF@H>VoP?C-3epe*eDa`{k#{Lh}5dB*IB&^q@^dspcw z*{S>5S+@qv25mo|2MXZJJ&3@EVMwylci+ZM-|U+pZ_>U##i&RPu;phX36uq!`WYM zuQ+x0aIW#?uCJ>CmgMaZlH9erz;M$kwy^X}yVJ`04rL{)UF_bfW@XxOZ&C5}sFGRr z`qh;NtAN)+N3WEq#VBMgx3ajg^6-4Spzrl;KN#P%xNxhBmojhoZN1F=@v9|2S02v} zVf539`uYF%0VVfsflQMktaxo0-u?R1u%37M&WyTG)u#OSbvJ1pxX19Uu~sR_O&cOAe?ab$o3cel=d;)W74m!J8*s4%eBnKto2u?e`474-e~dx?S!=~zg%kP z%YWFIRyA4mU)AAn3?GuVpOV|Tv^0TbMR}v2ulkMr-HhS0+UGi~T3lHh@cZSFb!DMv zz0}3kr|e(Mt+iVt^rrvw17DbRz81RaaD01}V;gTX>)uMSb&mT(&MTYiX2x7vw}fBs z|0BuTcgy{=H^yE2Gp$79WjN2rhzq5uyN_txFKNs7ZNK3BBJ0|uD_2y1?<$SGdB#x8 zx#mJ}(7soDr+*2)l&1LqQKbFvmzyKj@c$~6eQQ4J;v$nR3+Hax&*!N8b@9i{H^2<0 zTH+c}l9E`GYL#4+3Zxi}3=EBQ4UBb-3_}b}tqhE;j0|-R%&iOzmMOWkqG-s?PsvQH zMAu+wWoQb~;MS3H3aCL6WJ7R%T1k0gQ7VIDN`6wRf@f}GdTLN=VoGJ<$y87&z~JfX K=d#Wzp$P!eDFTN8 literal 0 HcmV?d00001 diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index e33f0ba8a..550f5acf7 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -224,6 +224,8 @@ + + @@ -309,6 +311,8 @@ + + diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml index 44fc2b9c1..1ff597a49 100644 --- a/java/res/values/keyboard-icons-black.xml +++ b/java/res/values/keyboard-icons-black.xml @@ -36,5 +36,8 @@ @drawable/sym_keyboard_feedback_tab @drawable/sym_keyboard_language_switch + + @drawable/sym_keyboard_zwnj_holo + @drawable/sym_keyboard_zwj_holo diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml index 5fba0253d..0774d57ac 100644 --- a/java/res/values/keyboard-icons-ics.xml +++ b/java/res/values/keyboard-icons-ics.xml @@ -34,5 +34,7 @@ @drawable/sym_keyboard_voice_off_holo @drawable/sym_keyboard_feedback_tab @drawable/sym_keyboard_language_switch + @drawable/sym_keyboard_zwnj_holo + @drawable/sym_keyboard_zwj_holo diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml index 837b1a37a..5798786f8 100644 --- a/java/res/values/keyboard-icons-white.xml +++ b/java/res/values/keyboard-icons-white.xml @@ -32,5 +32,8 @@ @drawable/sym_keyboard_voice_off_holo @drawable/sym_keyboard_feedback_tab @drawable/sym_keyboard_language_switch + + @drawable/sym_keyboard_zwnj_holo + @drawable/sym_keyboard_zwj_holo diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index a263acd9b..aceb4a517 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -78,11 +78,14 @@ latin:styleName="spaceKeyStyle" latin:code="@integer/key_space" latin:keyActionFlags="noKeyPreview" /> + + latin:code="0x200C" + latin:moreKeys="\@icon/zwjKey|‍" + latin:keyLabelFlags="hasPopupHint" + latin:keyActionFlags="noKeyPreview" /> + + latin:code="0x200C" + latin:moreKeys="\@icon/zwjKey|‍" + latin:keyLabelFlags="hasPopupHint" + latin:keyActionFlags="noKeyPreview" /> + -