From 3040c8bcdd7d4979e48e77b5c779dd2bf14ee9ad Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 28 Jun 2011 00:54:14 +0900 Subject: [PATCH] Draw popup hint "..." by text rendering Bug: 4959808 Change-Id: I30456b91852904c6801cbdd6476406fd60e84551 --- java/res/drawable-hdpi/hint_popup.9.png | Bin 242 -> 0 bytes java/res/drawable-hdpi/hint_popup_holo.9.png | Bin 324 -> 0 bytes .../drawable-land-hdpi/hint_popup_holo.9.png | Bin 321 -> 0 bytes .../drawable-land-mdpi/hint_popup_holo.9.png | Bin 1180 -> 0 bytes .../drawable-land-xhdpi/hint_popup_holo.9.png | Bin 373 -> 0 bytes java/res/drawable-mdpi/hint_popup.9.png | Bin 202 -> 0 bytes java/res/drawable-mdpi/hint_popup_holo.9.png | Bin 273 -> 0 bytes .../hint_popup_holo.9.png | Bin 333 -> 0 bytes .../hint_popup_holo.9.png | Bin 333 -> 0 bytes .../hint_popup_holo.9.png | Bin 206 -> 0 bytes .../hint_popup_holo.9.png | Bin 379 -> 0 bytes .../hint_popup_holo.9.png | Bin 206 -> 0 bytes .../hint_popup_holo.9.png | Bin 379 -> 0 bytes .../hint_popup_holo.9.png | Bin 333 -> 0 bytes .../hint_popup_holo.9.png | Bin 321 -> 0 bytes .../hint_popup_holo.9.png | Bin 1180 -> 0 bytes .../hint_popup_holo.9.png | Bin 373 -> 0 bytes .../hint_popup_holo.9.png | Bin 1168 -> 0 bytes .../hint_popup_holo.9.png | Bin 379 -> 0 bytes java/res/drawable-xhdpi/hint_popup.9.png | Bin 292 -> 0 bytes java/res/drawable-xhdpi/hint_popup_holo.9.png | Bin 410 -> 0 bytes java/res/values/attrs.xml | 3 -- java/res/values/styles.xml | 1 - .../inputmethod/keyboard/KeyboardView.java | 26 ++++++++---------- 24 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 java/res/drawable-hdpi/hint_popup.9.png delete mode 100644 java/res/drawable-hdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-land-hdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-land-mdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-land-xhdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-mdpi/hint_popup.9.png delete mode 100644 java/res/drawable-mdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw600dp-land-hdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw600dp-land-xhdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw768dp-hdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw768dp-land-hdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw768dp-land-xhdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png delete mode 100644 java/res/drawable-xhdpi/hint_popup.9.png delete mode 100644 java/res/drawable-xhdpi/hint_popup_holo.9.png diff --git a/java/res/drawable-hdpi/hint_popup.9.png b/java/res/drawable-hdpi/hint_popup.9.png deleted file mode 100644 index 5b2ad538861f7cceae3d058ba8deec49f74f62ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^#z1Vv!3HE{*CjpzQY^(zo*^7SP{WbZ0pxQQctjR6 zFmQK*Fr)d&(`$i(Q#@T9LoyoQ-gM+@HV|-oDEYC&Htqe7^5F7Yp}qYNYZW|1Cb^3# ztyJ0Su?&Wk%}FX^1hGu1HUSO9j$)iCq<=hvHLrK^3cVLL6cD$wwE zu&{ci?DxBW?WC=%pHC08Hr7fLvY!=kETFgRrOMU2;pa2$^R9FIzGAj>llT2tEf)uL OAA_f>pUXO@geCxu;ZrsM diff --git a/java/res/drawable-hdpi/hint_popup_holo.9.png b/java/res/drawable-hdpi/hint_popup_holo.9.png deleted file mode 100644 index c44af88839069c390470f9279a352575db87e5af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^%0R5Z!3HE}_#XTYq*#ibJVQ8upoSx*1IXtr@Q5sC zVBqcqVMgz)i_&I2WlmtRX($zHHCN7N6kfn9GfCr4mai?_XEFVH_(o2@_7b_0{%0nP}Oz#k@` zR0~+v9T2+_@j3Ko{DOXMb*;xvsi#()_0L=Dw=B%4u|t5R@#gPmTWih41miy6bMIMf SB{Ci8V+K!GKbLh*2~7a!e||au diff --git a/java/res/drawable-land-hdpi/hint_popup_holo.9.png b/java/res/drawable-land-hdpi/hint_popup_holo.9.png deleted file mode 100644 index 2b93014e1dd7fd0ea7bfcfe81fd3982440cc6772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^hCr;v!3HFydN;cODVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9s(?$DS^ZAsLNtXZmtA8wj|~zoaC(k^MsJcl)W_whp_$s>fP5afEPl z$sV?m5ZKT1%&>6bqdCk4LDQXo?N9qGr}wv<{g{)?WCKp!87*QyPTXn>Stnm;^2|7> zvPGcvNUnCy?tgmIRSg(SO22;lBvMfo9k(fMT8}~gt1P=)B`5Bwc&+5oXjt_2*O}AB z4<3f^-OeKW)4R$cQ4Jgy&t=K zZIUv!(Ld}8>coi({-Faw7&;O5hf;OZ>4q|)OdL1{`)8YTKPXHJ8&Vhg)YyMbcqz43aM!xW@N)D zW00}5VVuXB(b)Sd?q!&#DrT`nO4(N=-Lb-2pcAfJE=4m;?~b~w>7$r{G9EVV1Uo-_ zk_D!bU|)-7Vb)FIs@Xs3;lkuVQJ);uMT6bZ2YTxgC9p8jK;0U%eW{*cmv|+*4~{t& zEUA#u1iS21DVqZ+$HO2Rh9MpHK+uE2C?dpSv2MUa1Ublah!3Hd6yYTZLGxj$HP5I> zc|~p7qEdpb65>i6SF6>+wMf|UhB+jPV!*-kA*vDb8#dAEA=}^9Vo{KLt)5SRuI>cwomf-p&P4e`^AQfxjgoraZji9 zsBCM2Y3?3xC{U!{NQ0h9i=vGwjy`T-n`D#(OK-x4X-Ir52IYt-3y6>O#1Rc&NXfD& z!nlgWn1EUwt6}A&tO{u{stT%tkfO%ZN?hfUtnzUoEhHl?Y{vG9X6v|R*Q9ovSmCi) zDdk~}I9}0l##$Yat2)H-tBwm&g(%2sx@iY;P@d&z73`T4*ib#k0!#Uo%vJ11p)8{a zil~r>LEP~eQsthgnvSOAI83M5Cf0b8oN?3{E@+NNnx%C_J22R;v_2J9h6mepVmvw; zi=kgm)3G|2QRHI%;;j#VZ2t+afAh%E_0!ki*!aVJy)ietXZH2`L+jYxXN=nu{eUcX zT-p8Gd+!up{`p+#>B3>{@bg`tXUfkU>|1k>$sHVN`}8yGi{CGuo!gau5l*{p)9#^@ z(zS(&%VqJ@>8txDk9D2e+0l6Ez=G+&nq)@qZk-wVbMxJS@6n0Bz|`?Ol`s3we)WH~ z`o|0Z%)NWQ{lxaYi(=PQXSa1@```H^=f4|#Yi;*`Gar0&;qB!6yDVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9q_DjN+ayjv*P1Z)ZDp9dZzH@s^aF(<-MB`Q+d7Q%aT%&C;E>^6H#3 z+&m;6MVHue=q^;!zZ%cd?4{`$)U{aa(Y@EZKT2l$OG}9PH*hat&4^*pb$HB_!6+r} zzd#-VlgOWRW$RhpbN`Q2>8zWdw0GT^+&=Y$M7{Su^BVq0?iJs8eD>?p zpS_D`2mfVxbFJlf;u+zB=}Xq-{=2jB=Jqxv^S|ob73<6*tmiS{cMjaePvTow|G6LF cmHC}%d#r8r=dgoHz;I*mboFyt=akR{0DzK=tpET3 diff --git a/java/res/drawable-mdpi/hint_popup.9.png b/java/res/drawable-mdpi/hint_popup.9.png deleted file mode 100644 index 444cc26ee69c1e754a95d8c977e7169fab1e9321..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^NDSr z1<%~X^wgl##FWaylc_d9MLC`>jv*Dd-rR8HI-tPg61cp=<$e9skb_IN1&Ff!Vs2Xf zAwW6M)g_A8)6_RZ^Els$z8#Z185lo_-DJFYYW`YACKe6>1&0O(Mx*8}br%=qmsS*A zviZ*!^s8dl?{yrZ&R1)!l$Wpndy)T%?g56ES7dENwbS1L?Pc(E^>bP0l+XkK`Yhrv>v4-jc3p)tz)~ z|Fx|XZXVJ&?R1URJl2k5X3d03A0f34j)oS)RZj2L#GOeFyCQS!y3V- QK<6`fy85}Sb4q9e08eaYIsgCw diff --git a/java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-hdpi/hint_popup_holo.9.png deleted file mode 100644 index 2ffc6ea2b374664d35e3ca4ceba205c10b435cb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^hCr;v!3HFydN;cODVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9s(?_nt0}AsLNtXDad^G7xZ+XEDiYGg~Nj`2T-d37({+-~_c9jv@zj zOZxm5JTnfeY)KG`GT_vm z(IV#K#JzgY;=EhEd)_tjDO8kueKIZZSSFKtCf4YaO-1?qO)ut{bIv=;9CB&J>~B(g zc6-l1^FNoa!K{orq+&+CtXJ7n;CMGMKY5y?VNAa*Pebs!Che7xfIw QfnI0uboFyt=akR{0PsbD-v9sr diff --git a/java/res/drawable-sw600dp-land-hdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-land-hdpi/hint_popup_holo.9.png deleted file mode 100644 index 2ffc6ea2b374664d35e3ca4ceba205c10b435cb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^hCr;v!3HFydN;cODVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9s(?_nt0}AsLNtXDad^G7xZ+XEDiYGg~Nj`2T-d37({+-~_c9jv@zj zOZxm5JTnfeY)KG`GT_vm z(IV#K#JzgY;=EhEd)_tjDO8kueKIZZSSFKtCf4YaO-1?qO)ut{bIv=;9CB&J>~B(g zc6-l1^FNoa!K{orq+&+CtXJ7n;CMGMKY5y?VNAa*Pebs!Che7xfIw QfnI0uboFyt=akR{0PsbD-v9sr diff --git a/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png deleted file mode 100644 index f5d15b72856e2fd5a549ddf80fd02243503be36f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^ia;#G!3HGXGhCAaQd2!$978;gC;#~W-=10E5BtR% z1|gG{%~-&k@s?x4N0wNN2Yn0JVw!O7q{g>4K;zAA=c3TACdVKGTp zN?1-X?hDZ25)F0~3O=an=Ifr}#QTjQNpHmrkx8vVJC3ZFrRJc>P|Ofz@=;hw`mF5X z`+_A|p}cFD-7bR-cATPIkm|l`s_=$?XB`qJI5V7Cq(8TQ&YKxP2QqlN`njxgN@xNA DS(8b8 diff --git a/java/res/drawable-sw600dp-land-xhdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-land-xhdpi/hint_popup_holo.9.png deleted file mode 100644 index bc37fa844eaed229a97cba24c861336b648b64c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^4nSDVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9q_DjIy3Cjv*P1Z)b1pI^-bYy1x5b*zFk&ncHvv|KFFpZKKD;kXuVG zq;+qsWKJ~bR(c{*%zvU~y13=e&rPlYnyQ{&A6Itm`2H)e#_iVvUY>6C1B@4#O!yka z78EjUVd!OEz?vb$pzH9MA%jth-GTdp1w&Lr+V2%N_#fNx?N6GkvNC)2{YClW?e~v{ z|8e<$U%QrNUPEiuy`SfQ-r|4kI%(H7OZUGLuNUs9>-zd7>Hez7Q7hq<@L} za#w7f{_FGK*7|)F-thB%ihWNd)4EAlww^sKJNs{z#;;}Nzrv2ZXU#e;`~cbZV}u>3 jwqJ79r+R12rDtUyOt+0Kp3S`h7Vw!O7q{g>4K;zAA=c3TACdVKGTp zN?1-X?hDZ25)F0~3O=an=Ifr}#QTjQNpHmrkx8vVJC3ZFrRJc>P|Ofz@=;hw`mF5X z`+_A|p}cFD-7bR-cATPIkm|l`s_=$?XB`qJI5V7Cq(8TQ&YKxP2QqlN`njxgN@xNA DS(8b8 diff --git a/java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-xhdpi/hint_popup_holo.9.png deleted file mode 100644 index bc37fa844eaed229a97cba24c861336b648b64c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^4nSDVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9q_DjIy3Cjv*P1Z)b1pI^-bYy1x5b*zFk&ncHvv|KFFpZKKD;kXuVG zq;+qsWKJ~bR(c{*%zvU~y13=e&rPlYnyQ{&A6Itm`2H)e#_iVvUY>6C1B@4#O!yka z78EjUVd!OEz?vb$pzH9MA%jth-GTdp1w&Lr+V2%N_#fNx?N6GkvNC)2{YClW?e~v{ z|8e<$U%QrNUPEiuy`SfQ-r|4kI%(H7OZUGLuNUs9>-zd7>Hez7Q7hq<@L} za#w7f{_FGK*7|)F-thB%ihWNd)4EAlww^sKJNs{z#;;}Nzrv2ZXU#e;`~cbZV}u>3 jwqJ79r+R12rDtUyOt+0Kp3S`h79s(?_nt0}AsLNtXDad^G7xZ+XEDiYGg~Nj`2T-d37({+-~_c9jv@zj zOZxm5JTnfeY)KG`GT_vm z(IV#K#JzgY;=EhEd)_tjDO8kueKIZZSSFKtCf4YaO-1?qO)ut{bIv=;9CB&J>~B(g zc6-l1^FNoa!K{orq+&+CtXJ7n;CMGMKY5y?VNAa*Pebs!Che7xfIw QfnI0uboFyt=akR{0PsbD-v9sr diff --git a/java/res/drawable-sw768dp-land-hdpi/hint_popup_holo.9.png b/java/res/drawable-sw768dp-land-hdpi/hint_popup_holo.9.png deleted file mode 100644 index 2b93014e1dd7fd0ea7bfcfe81fd3982440cc6772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^hCr;v!3HFydN;cODVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9s(?$DS^ZAsLNtXZmtA8wj|~zoaC(k^MsJcl)W_whp_$s>fP5afEPl z$sV?m5ZKT1%&>6bqdCk4LDQXo?N9qGr}wv<{g{)?WCKp!87*QyPTXn>Stnm;^2|7> zvPGcvNUnCy?tgmIRSg(SO22;lBvMfo9k(fMT8}~gt1P=)B`5Bwc&+5oXjt_2*O}AB z4<3f^-OeKW)4R$cQ4Jgy&t=K zZIUv!(Ld}8>coi({-Faw7&;O5hf;OZ>4q|)OdL1{`)8YTKPXHJ8&Vhg)YyMbcqz43aM!xW@N)D zW00}5VVuXB(b)Sd?q!&#DrT`nO4(N=-Lb-2pcAfJE=4m;?~b~w>7$r{G9EVV1Uo-_ zk_D!bU|)-7Vb)FIs@Xs3;lkuVQJ);uMT6bZ2YTxgC9p8jK;0U%eW{*cmv|+*4~{t& zEUA#u1iS21DVqZ+$HO2Rh9MpHK+uE2C?dpSv2MUa1Ublah!3Hd6yYTZLGxj$HP5I> zc|~p7qEdpb65>i6SF6>+wMf|UhB+jPV!*-kA*vDb8#dAEA=}^9Vo{KLt)5SRuI>cwomf-p&P4e`^AQfxjgoraZji9 zsBCM2Y3?3xC{U!{NQ0h9i=vGwjy`T-n`D#(OK-x4X-Ir52IYt-3y6>O#1Rc&NXfD& z!nlgWn1EUwt6}A&tO{u{stT%tkfO%ZN?hfUtnzUoEhHl?Y{vG9X6v|R*Q9ovSmCi) zDdk~}I9}0l##$Yat2)H-tBwm&g(%2sx@iY;P@d&z73`T4*ib#k0!#Uo%vJ11p)8{a zil~r>LEP~eQsthgnvSOAI83M5Cf0b8oN?3{E@+NNnx%C_J22R;v_2J9h6mepVmvw; zi=kgm)3G|2QRHI%;;j#VZ2t+afAh%E_0!ki*!aVJy)ietXZH2`L+jYxXN=nu{eUcX zT-p8Gd+!up{`p+#>B3>{@bg`tXUfkU>|1k>$sHVN`}8yGi{CGuo!gau5l*{p)9#^@ z(zS(&%VqJ@>8txDk9D2e+0l6Ez=G+&nq)@qZk-wVbMxJS@6n0Bz|`?Ol`s3we)WH~ z`o|0Z%)NWQ{lxaYi(=PQXSa1@```H^=f4|#Yi;*`Gar0&;qB!6yDVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9q_DjN+ayjv*P1Z)ZDp9dZzH@s^aF(<-MB`Q+d7Q%aT%&C;E>^6H#3 z+&m;6MVHue=q^;!zZ%cd?4{`$)U{aa(Y@EZKT2l$OG}9PH*hat&4^*pb$HB_!6+r} zzd#-VlgOWRW$RhpbN`Q2>8zWdw0GT^+&=Y$M7{Su^BVq0?iJs8eD>?p zpS_D`2mfVxbFJlf;u+zB=}Xq-{=2jB=Jqxv^S|ob73<6*tmiS{cMjaePvTow|G6LF cmHC}%d#r8r=dgoHz;I*mboFyt=akR{0DzK=tpET3 diff --git a/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png deleted file mode 100644 index 01d1139d87ad4a618340a075ae5df7e30d31c779..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1168 zcmbVMTWHi+7>Ek2n^PCK#9#pKjU zs}DsKc9%tcP<&PTu%II7li-7jFJ2zJAiJ>a!qV!SA`~CI)XT|qrutBPFp!+v|9#*8 z|L6bnTcN+NrFly;MNuueU2>6(Kasb6c@z1*qW)?p!)B}u;sIv}S2Yh&X~QWaI%jFa zsE9OU{LnqrMNyFGr=P% zX5Oj6e1Xn79-=#AAgY4|pc60#;~jz^{7mxz0uJyT)Jy9fOT%frei~-KF!nkVIJ}#m!ZY*l;m&RSh6_M|Zc{;g|A+`Y~ zx%;+IXh^(~_If6{6m3*?^f3$BI47qVauPF4L*fMiq~l_`1M=}i5|Z#cvgx!af}{#X zp#wHJ7Q;eC0ICp|K_b}+p#n0ZA}CPE3Tje;P)IbeIorpYt)qsnNp$Pj>^HGe)v@EPMLh!@H9|P|r8@9;~eB-8eHwMdT$f+o@HQdUWHe=DtUf zKcw>0)~S=5_MZ&iyx!b%`pL5CQ?pNse_tqH?%lom;!B;Q2g_@Iy!td{72-J Ke)&q~z_HKy-gr3x diff --git a/java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png b/java/res/drawable-sw768dp-xhdpi/hint_popup_holo.9.png deleted file mode 100644 index bc37fa844eaed229a97cba24c861336b648b64c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^4nSDVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9q_DjIy3Cjv*P1Z)b1pI^-bYy1x5b*zFk&ncHvv|KFFpZKKD;kXuVG zq;+qsWKJ~bR(c{*%zvU~y13=e&rPlYnyQ{&A6Itm`2H)e#_iVvUY>6C1B@4#O!yka z78EjUVd!OEz?vb$pzH9MA%jth-GTdp1w&Lr+V2%N_#fNx?N6GkvNC)2{YClW?e~v{ z|8e<$U%QrNUPEiuy`SfQ-r|4kI%(H7OZUGLuNUs9>-zd7>Hez7Q7hq<@L} za#w7f{_FGK*7|)F-thB%ihWNd)4EAlww^sKJNs{z#;;}Nzrv2ZXU#e;`~cbZV}u>3 jwqJ79r+R12rDtUyOt+0Kp3S`h7_EUHescJKGq9smC=`~8yn+?icW YHc9f?mKV0A0G-C*>FVdQ&MBb@02P>IsQ>@~ diff --git a/java/res/drawable-xhdpi/hint_popup_holo.9.png b/java/res/drawable-xhdpi/hint_popup_holo.9.png deleted file mode 100644 index a2b114e1489b4b0b3671bcda39e48c87fa948319..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^dO)nj!3HGHXk;n^DVAa<&kznEsNqQI0P;BtJR*x3 z7`Qt@n9=;?>9q_Dj5eMwjv*1PZ)fcFIvgP3;NR37)YbeV;hlhtmB{yXj~+SyD6{Ka zy?BRJ%cK_<7It`Odf2tAn8a0^?md*tbiZ+TjqQZVcmAn%a5O}$zJBFw*P<^1o!?_0 zbhov;9d=&)aN)%d7cwd`Ol(Y~bAiX1DcYuJ|k2xBuKdeE8v7na}oxt@{~fnrb&zW=-}R2DjJotm96aaPJt|9qY~n|`uY`S}J_mGFO)oMShSqYvtZ z-w6};J2mfp1oVK1OUEMldZFLn_Wc*rP^w|%U!Knt)ngY43|t0JS3j3^P6 - - - diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 07a7f3c86..1f1488e26 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -49,7 +49,6 @@ #E0E0E4E5 #66E0E4E5 #CCE0E4E5 - @drawable/hint_popup @layout/key_preview @drawable/keyboard_key_feedback @drawable/keyboard_key_feedback diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 840e52894..157c2b4e0 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -100,7 +100,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { // Miscellaneous constants private static final int[] LONG_PRESSABLE_STATE_SET = { android.R.attr.state_long_pressable }; - private static final int HINT_ICON_VERTICAL_ADJUSTMENT_PIXEL = -1; // XML attribute private final int mKeyTextColor; @@ -125,12 +124,14 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { private final int mPreviewOffset; private final int mPreviewHeight; private final int mPopupLayout; - private final Drawable mKeyPopupHintIcon; private final int mKeyHintLetterColor; private final int mKeyHintLabelColor; private final int mKeyUppercaseLetterInactivatedColor; private final int mKeyUppercaseLetterActivatedColor; + // HORIZONTAL ELLIPSIS "...", character for popup hint. + private static final String POPUP_HINT_CHAR = "\u2026"; + // Main keyboard private Keyboard mKeyboard; private int mKeyLetterSize; @@ -369,7 +370,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { mKeyTextColor = a.getColor(R.styleable.KeyboardView_keyTextColor, 0xFF000000); mKeyTextInactivatedColor = a.getColor( R.styleable.KeyboardView_keyTextInactivatedColor, 0xFF000000); - mKeyPopupHintIcon = a.getDrawable(R.styleable.KeyboardView_keyPopupHintIcon); mKeyHintLetterColor = a.getColor(R.styleable.KeyboardView_keyHintLetterColor, 0); mKeyHintLabelColor = a.getColor(R.styleable.KeyboardView_keyHintLabelColor, 0); mKeyUppercaseLetterInactivatedColor = a.getColor( @@ -838,19 +838,15 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { } } - // Draw popup hint icon "...". - // TODO: Draw "..." by text. + // Draw popup hint "..." at the bottom right corner of the key. if (key.hasPopupHint()) { - final int drawableWidth = keyDrawWidth; - final int drawableHeight = key.mHeight; - final int drawableX = 0; - final int drawableY = HINT_ICON_VERTICAL_ADJUSTMENT_PIXEL; - final Drawable hintIcon = mKeyPopupHintIcon; - drawIcon(canvas, hintIcon, drawableX, drawableY, drawableWidth, drawableHeight); - if (DEBUG_SHOW_ALIGN) { - drawRectangle(canvas, drawableX, drawableY, drawableWidth, drawableHeight, - 0x80c0c000, new Paint()); - } + paint.setTextSize(mKeyHintLetterSize); + paint.setColor(mKeyHintLabelColor); + final int hintX = keyDrawWidth - getLabelCharWidth(paint); + // Using y-coordinate "key.mHeight - paint.descent()" draws "..." just on the bottom + // edge of the key. So we use slightly higher position by multiply descent length by 2. + final int hintY = key.mHeight - (int)paint.descent() * 2; + canvas.drawText(POPUP_HINT_CHAR, hintX, hintY, paint); } canvas.translate(-keyDrawX - kbdPaddingLeft, -key.mY - kbdPaddingTop);