From 7e753119260e53628f279176b0a41f5ef5713ce8 Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Thu, 16 May 2013 11:53:23 -0700 Subject: [PATCH] Using proper Unread icon for unread "folder". Fixes b/8967972. Change-Id: I1089fdeac5803fd6f9bed19d1c22d0629814ba87 --- .../ic_folder_mark_unread_holo_dark.png | Bin 0 -> 1304 bytes .../ic_folder_mark_unread_holo_light.png | Bin 0 -> 1358 bytes .../ic_folder_mark_unread_holo_dark.png | Bin 0 -> 995 bytes .../ic_folder_mark_unread_holo_light.png | Bin 0 -> 1016 bytes .../ic_folder_mark_unread_holo_dark.png | Bin 0 -> 1683 bytes .../ic_folder_mark_unread_holo_light.png | Bin 0 -> 1749 bytes res/drawable/ic_folder_mark_unread.xml | 20 ++++++++++++++++++ .../android/email/provider/EmailProvider.java | 6 ++---- 8 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 res/drawable-hdpi/ic_folder_mark_unread_holo_dark.png create mode 100644 res/drawable-hdpi/ic_folder_mark_unread_holo_light.png create mode 100644 res/drawable-mdpi/ic_folder_mark_unread_holo_dark.png create mode 100644 res/drawable-mdpi/ic_folder_mark_unread_holo_light.png create mode 100644 res/drawable-xhdpi/ic_folder_mark_unread_holo_dark.png create mode 100644 res/drawable-xhdpi/ic_folder_mark_unread_holo_light.png create mode 100644 res/drawable/ic_folder_mark_unread.xml diff --git a/res/drawable-hdpi/ic_folder_mark_unread_holo_dark.png b/res/drawable-hdpi/ic_folder_mark_unread_holo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..9c2ceb2c4e22d2228a62b5883b1dcd44a4e100f7 GIT binary patch literal 1304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-G$*l2rk&Wd@@jkv%n*=7)X17vD?XPI|c^k7oIMTAsP4H&h+h$aTRHsfBUh7@kt*Z z4k5)^9EFdMt^HWvk+NDtXpx%MyHe#AjV`vBnfDcTh`2bqxCWFgOiB_GJ$Pb*XUL3s z?~c39pS5z`&hlT$zn(EaZ#_MCUufyM-`Ad7nu;2?&HBIQ((|wUp{5h}2F{qdRqB!K z0`dLN8|tK;w&gButWer5QXjuwb9U#1b7dXrPqf+g@-)ZYXO>~#$GDGe9@D#|3YS$< z)^C+9dzLRgw=(q4z14Qh=ao0q*{rf(aef7N;C8KB+q6?yKDvIb{OaUZ=N*>U%UB1Lw~?j|WNF`ha> z@W}hH_z-Up=%>4b}t(8s^8v|p{) z6_7Von!f1rx94-bLR5e9=rb;FVCLbQA8N+8*lZ%-F6+bB-ye`ZFtha1&4=M!D{fdg z>L0J>-LW|JlCQ_U@P_7(>sGCbdjE25$5$ie<&E{3`@akSI*|7urQl8P)l(1u)>=M$ zRJ6}{%h{SBzUW?uRW~}TL=E1b$W6Gtq9O0co0R)m7gZb{tk0-W<>4y%{PQ~7rqUa{ z_gSV#?f2as!1|`Qod1WqOu#rW0zgQ%O)8{DT5=vdKZ!zaUi0N1FN9|X) zUzvL5|EDEP)0(zqnRolITa~}6U8-ftx9=;TU$K8w8E+eKMYGd>#XjM^xj){d)v3>N z+SxE=$&-L6@~|{>smJeI@-X(vx?o)t?Nn4`W(mnD^z{ZNoP! z-)_{1KFhM^*miZJgZwMsAC+0ZdG7B#5rfQ};PT%EOh4o*Z1>4)zIkpJbaVHC?FTON zB+c{PF8Vm>)&m{!O=2p31{{t1Prdr`*t5=#?H%JhmNM7dD?9ST9e~z%?`}Na$lus6 z!593jfxp4OF6P)xXBEoAah$wZE#p(eGLE+COHEcW3H9Ds-t? zZujWf-v5E@;hL3qbGc`vE}Qz!R-SDigB|0(o=uAnBo=Ijdcx7bq!5J49%^KEv-z9bPdd{3=CqIuzy0)kei>9 znO2Fe!OY6U1fpS|(#4-Z4U!-mg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4hf=Va` MPgg&ebxsLQ0KKh1^#A|> literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_folder_mark_unread_holo_light.png b/res/drawable-hdpi/ic_folder_mark_unread_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..90b33385e0cb8065d6bf17e7c077509fe7a0c652 GIT binary patch literal 1358 zcmV-U1+n^xP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF000CY zNkleTph9>SyD9!Y)#F?(AWH@q zAbbPv#sSRWX}pKO>INAZphNgn4$!Z#PfuNqPKAdusD5pUs-VL=uFbciq4?#;L#dvWEM!h3;a zEe)IqkT>zW?mcA@MAZy5Lgaa{dNN6MyGIn0L)3|OI4DZqttMnv>&zOcbA4? zti%~Z)@(MlTCLivsh}m8{DHacqk)d&2^pkUWqeKO}jS6NNw} zNRLrp7k{7DV>T*;Zs`N-HF%nwY1}| z>kvLvxjU-2X>@?Bm#p?TlHCx(%KT*?`P?fp;=3i!GqUid0`vlz4H0`J3;b2lWBAioaTA&ve{JcLW6RcJ46z{k>tRK7DBE2hU!(FJiWzQAYr zGS1zMTP!S}wG~En0+bNbxHUdGvi+#Fs;e6yLkO|u@>sc>o@)Rl$i!>tvsI)|Ec(qr zyW@K~BAdTT4Z{@mrFCAeSW;1cGS1H|BS2enuqQ2{sJ~_zh4%vKS=9gMquP- zIx{vpG&C(RH##sdz9P~20000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{Q QJOBUy07*qoM6N<$f(;N~0RR91 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_folder_mark_unread_holo_dark.png b/res/drawable-mdpi/ic_folder_mark_unread_holo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ad7eee5d1b29eec7bb0d31606591fd3cc2200943 GIT binary patch literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F_88EW4Dvpb_@(mn>}3|Ln02poqje;#8KdQ{a)jny$Wi9 zD(UhE+b`^`?(7JBY`h{tz~(2*yd%vI9QVAun=bI@fXamCCV58{c@HMTnP=}G4$04& zee>?kSVsZwS+m}*Tlate>gB7_n3X%0{E%qid2!?Y51j@9r`-8lb$&B&TO?NPPg*NB z@t8pZGrvRLE{0_dt`B%WNbSgZ-MYQ>xBKKBfk6|d%ytX%zEtX|t@ZRoo66qlC9apI z+%%iCSD5+!ge|WcxIJa1Ta`aKURtyyEmw(8!gHqaylGohGS@O$O!ZI`irkp7_0B@0 z{!rH=%=dj7`0skM_c}{YJh4hP$x294tWnkTHD5(gr`@%;Qq@WVk51~ArZx62GtaF} zSaxNC^5@+q=B%{0h4%vT_HW7`yI<>|ZFZCIW)l=u0Bf9mq}y=>oj_e6P&dDV2)fA2hgCE0DyS@%6^GVknln>;Utdv5>hc3D4m-F}a2&s6SC z-7@jVtu@XGw|lymEUKNnC1;y>&btFSDaFB)-g*Cu3v^7~SIrT!tj%-Jb>-d9Hy>b5 zkgIt0&T!rn_75Bpo2vECxSwmV3R-^3Rb4QnaZ{Atwx2u|961crWj5~V`(HDoaq^i( zhWs|n>zMrCl+15mfV%QAh}8J)Vio8+@UN*%hhw8<~gXw-QxYO@p;F|ANLvl zssxzr+{^O$z1OWi?ZaQ%m;RRP`6T{s|DWBTq@R?|bv?;vQ3OoKswJ)wB`Jv|saDBF zsX&Us$iUE8*T7WQ&@{x*+{)O}%EU<5z}(8fAa)7+Cln32`6-!cmFODGtV~QG8ulq& z{0Y<`39=zLKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MJ0|voUzO`njxgN@xNA$upmx literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_folder_mark_unread_holo_light.png b/res/drawable-mdpi/ic_folder_mark_unread_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..f2462cb2e10a84977060f4af41681e19db92653b GIT binary patch literal 1016 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F_88EW4Dvpb_@(mCp=voLn02pz3#g@G*p89!~K2FOLRHz zE9jYuol2BHB%|ebrsKf-3*0-K*$UT+6g}{e(coJ%Wkuq|I`(cOcE@uvE-Hnr@#l8l zK3H|lcJ*7k?{8|~I|#_%SX28g?)A_A^S{?>F{hN4n%)nSNR-__P|WXP_QW-%vCl7*Rz0xrONeLqzG{lE%IhD( zt9L|HCBz71Zjg>Y`pe(HTilcHx!s(D{5xhF9$$Ob@>uytwSPys({9>@XsuNG_TYNc znYJElKHcNLGIQygBX#!Rt%@0p*OsttcJ`VPbg}G--Mz`H64xGi)Aio8M*nJo z=LSyyDdForrk$IY^W^Y_%DuePI8(UGAB(T#iko&TCoE{IROq^wDZQ^ zZ$81kFem8E?k4$Eb7Q1=&DN#W!A#yqpLxpIiMse5+0AUBGW7;a`{SDu z^S$oAPl>S6Y?y!GwN7tRvFg=#BI{i;!U|S)B%hnVztHd1lF2)!b$vL)8mSWL$!68H zzrb!@e}Pze!4d_tcZ=)yWH>8UdaZk4bnj^EhIiXczLp)G7Z|_PnIk3NBj6&6njodQhUswJ)wB`Jv|saDBFsX&Us$iUE8*T7WQ&@{x*+{)O}%EU<5z}(8f zAa)7+Cln32`6-!cmFODGtV~QG8ulq&{0Y<`39=zLKdq!Zu_%?nF(p4KRlzeiF+DXX XH8G{K@MJ0|2QqlN`njxgN@xNABd)mz literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_folder_mark_unread_holo_dark.png b/res/drawable-xhdpi/ic_folder_mark_unread_holo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..93c580ac53eae2a6ad25cf7f636d3a66567e8fe7 GIT binary patch literal 1683 zcmZ8idosm9a%X#m_W+Vde+O{rli!9H}*{2Vv06lNS|us;A9 zL;!O00N7NPa^C=O+5v!t7y#VM0KgT{%=~+bl9~U8 z_xFj10Z`+x7_?)e$))n)LYx=&+p``{M!eEU5^;ZdKZG%1cdC{$3hFfRCJeML`D;{Q zfg2(Rg`$1XIz|;a5Ifj^Kr}7wKbvkmk7V+3k5&(P z>moJqU8sM^`}M;s6?YffRT6QuAMLN{Dst3lx#s6MlGU2+_Y%a{FzXxAaI9SmW3h`q0ZS13Ho_H|B&Gsu0N9_Cy2p3hv{h-2OJb1!*1#}`Wu@#{`nS>V~!sI{o98~K~2*`m$~G392m$CFS*BEz0u zfAYaXS5Y*aszrsJXl-lrSf6I!T(44@)|gh$X>Y3(zd2~UZUIHx>1r4Msyy{U)iF~TlH zNQvg#g!z{GDSW||3y{aoo? z>9>sxB-8ouev*^j{1Fz0`h3n-59+MHU0VEvOaDxvjYf}|U-Oj$Ym*rQpD1-ZZm5V* zz0&)k(!O8qXyz9PlLFFoag{XHb1cYK!`$C{le@ODB$Zr0n$;J1kn}lhvbdB&HqSQW zr?-n&_fA>!1BOVJ^ZMQQ=CtS5WYRbS^+UJu#5n}C@X-%ro~?`SJ#(Pt)UDpEZo-R} zm#^JwSL42WpU#nIrL#5}eysz;swd$XPqg;O87KX!oJ~WP24~afcae*uIxF20Tb1{N z%BzyW6ioFpXPyMvLfDqUx9t_l)spbnyly%FJ$Q`S(A`iGjc#-_3QBNS;_>6ReyF{A zGqXSMai5bT^Ln2JX&EkoYlX=zXeq--_Ssy0i)Wu(O~|-e{1Im#gzmEdaZO!)RhXpa zbIHbBn?p70O>0*SNPDu5SYC^4uH_|Fqcc2!N!$ImR_u%ZXw zZ3W-hGn(zz=`@ZnE7NOJ?W4>N4^ifKa;}cH3D@)X{Hn+^wc5(fY#b3nVz0g^h|{}6 z8WU{Fg-vjy3ua#*s(2;_4XxSRHuFIPrWX^XfB0?MUQ{4MR2edrRlC{q6ao5_)9mqX z!tE8`=@LWOHaCCE%hR&DWylvNoM=bsT7v^JUfNd2)XNtxVOC%2_h9PYOub^@6AcNl zXT(64pF4r<1+qC+a8O&4xSW3B8|0H0$mgh>;wJA1HfmSf%8YPBqw!_M8J|*mH3^p- z{+kj}JMa=?(dZ&lBTadCEmFP0Qn|6IJa^71o|1s0gL26nob5=?$4IX3PHygGM>_{s zcL#^adX0bmk0D9G<;R`*e}juVnfxC^7yidTl?H>|2}cESsp+w&c!0(guz6;zq}X^~ XFfW#SM)*B%_c;KTR{*1#9&`RLeU#fF literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_folder_mark_unread_holo_light.png b/res/drawable-xhdpi/ic_folder_mark_unread_holo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..120e72bf6892a188d72404e16174b08a3694509e GIT binary patch literal 1749 zcmV;`1}gc9P)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF000H0 zNklP+5ky501QA7=-C527GDMI0`5~1ptHq&i1+&ecprER_+6j%?GdSkO0c+Vt+l`l zh_#+o<$V@UBbz(NdL({KA@SrQI>d-xJi_Y%9*bW9JOYd(fex};+=uwMKM{GvZ~Clf zkLW0*$KvaOmk^8ZR^|J(xDRm|E!WNoLBwIcympkV$QpGNlhX(c1{O;8d{mKDIy`e|O_>XM#- zF8CXm8MMY7FxP8`Gz7GWqUjv6&TQQ+G!JN~j3%#l7w{2K14f+hX8^Tkvl(jrZb1-W zvIId;QyC2-cy<9F0WDw;vKs)LBn7JjM9=beBET#=13c(?XCWZ7ylI2rFcMMQz--x- z+ca=wnkTETpDz|&g#Zg2!@yzSJ>VLmG}w;C10%xb z)KA-)EFB&LK0wl8^YToYV5ki41nvet0p0|@(TN&C5QIS61nPADPN*xm307NMs&l-f zy!E&Je++mG*op+g6L?}(np0e;6D&sxA73lGV`TG)x-;giHY;Ly>k|nUZv&fveZUc5 zn<_uAFwzeJHlexKuo5u|e56E}LiMC8F6VC(dIYH*?$x#n*}sj<#Qr*V-BE5c@UhBr zFHuFvJ+0kJ& zjlieCA>dA;)YsDBp3zSwC+-o;fO~+ikoCBk$YMs=I8yJoGsTcLQ)DCJRi=;y#+y{} zFM->MmVp@~^94^{r7YJY8pwK_L@c_=dC!(fQg90Ow;LRSZw5X~P&~86iz2`Tc0FPU zS)Y@@b&irX&lpz3xCJ-}+@{~H2-=s$izL8>dBhA7pf;$`U*Hrf5@e|%F#_NU{XB_h zi(H5VpvqXHwN;fkfJA$9Wj6@cfzJ`E*MK{;?=lMfM~<)Xh zxw1R}yoS{FeF1aP5MU&PNUeT9@T8LQqmpwu674PUm7;u^1VEI^)`6?F#SuF1mVz<~ zfK!jZrnDV$O8>{rvI%gB7{rBYq998e6#;`5V9;3d1oUz@SlZs415DQ3?*))*>flz8f4KwB&uldp}sALWK$yDpaUYp~4cxe>x25DXySo6aWAK zC3HntbYx+4WjbSWWnpw>05UK!Gc7PREipAzF*iChIXW~lEigAaFfd)D2l4;_03~!q zSaf7zbY(hiZ)9m^c>ppnF*7YNH7zkUR53R?Gd4OjG%YYUIxsN4BGLH(000?uMObuG rZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o00000NkvXXu0mjfJ9F>4 literal 0 HcmV?d00001 diff --git a/res/drawable/ic_folder_mark_unread.xml b/res/drawable/ic_folder_mark_unread.xml new file mode 100644 index 000000000..a97b7017c --- /dev/null +++ b/res/drawable/ic_folder_mark_unread.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 2e9e854f0..0ece4c0d1 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -3008,8 +3008,7 @@ public class EmailProvider extends ContentProvider { " NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME + " WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null); row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = count; - // TODO: Hijacking the mark unread icon for now. - row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light; + row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_mark_unread; mc.addRow(row); return mc; } else { @@ -3033,8 +3032,7 @@ public class EmailProvider extends ContentProvider { " NOT IN (SELECT " + MailboxColumns.ID + " FROM " + Mailbox.TABLE_NAME + " WHERE " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_TRASH + ")", null); row[UIProvider.FOLDER_UNREAD_COUNT_COLUMN] = numUnread; - // TODO: Hijacking the mark unread icon for now. - row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_menu_mark_unread_holo_light; + row[UIProvider.FOLDER_ICON_RES_ID_COLUMN] = R.drawable.ic_folder_mark_unread; mc.addRow(row); Cursor[] cursors = new Cursor[] {mc, c}; return new MergeCursor(cursors);