From de46acddf597da5637b99a8a6e52ffd642ae913e Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 30 Sep 2009 19:30:56 -0400 Subject: [PATCH] Update SD card notification icons. Stop using SIM card icons for USB notifications Fixes b/1700510 Change-Id: Ic7e251a7ecad3ed46044181eae41481791df85bd Signed-off-by: Mike Lockwood --- api/current.xml | 11 +++++++++++ .../res/drawable-hdpi/stat_notify_sdcard.png | Bin 905 -> 784 bytes .../stat_notify_sdcard_prepare.png | Bin 0 -> 1811 bytes .../drawable-hdpi/stat_notify_sdcard_usb.png | Bin 1173 -> 1270 bytes .../res/drawable-mdpi/stat_notify_sdcard.png | Bin 539 -> 552 bytes .../stat_notify_sdcard_prepare.png | Bin 0 -> 1046 bytes .../drawable-mdpi/stat_notify_sdcard_usb.png | Bin 704 -> 781 bytes core/res/res/values/public.xml | 1 + .../java/com/android/server/MountService.java | 4 ++-- 9 files changed, 14 insertions(+), 2 deletions(-) mode change 100755 => 100644 core/res/res/drawable-hdpi/stat_notify_sdcard.png create mode 100644 core/res/res/drawable-hdpi/stat_notify_sdcard_prepare.png mode change 100755 => 100644 core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png create mode 100644 core/res/res/drawable-mdpi/stat_notify_sdcard_prepare.png diff --git a/api/current.xml b/api/current.xml index e4d6308d5be6b..673ebe8b0a802 100644 --- a/api/current.xml +++ b/api/current.xml @@ -10956,6 +10956,17 @@ visibility="public" > + + hI@;uJqEkX1B@7t$N%gIpy;M>vDIotLZJ|Oe0(G)CnwM5pPrtGBuVmoqtOsI zn@t|nqUsnk7=H}suuF1wc1E(}YbOYrOUdMgaFTrTD7cDwyo z$0MRLolX_!(GJ?<0)`%g}h5Nh{iEySoPOf3-TxL*vULzF7K>d&y}6}To+p$lFss#i3q?>ahP1ug_av zWA`8!1b)-uaD2dCpSOTrvR<#7OknVuUvj(M-%ap1@x_%#*+5SP0s#_2&%N!1*}FR&z8Om0GRV9ha{??;q~o!5HPY00RJ)5Ip387ECz+0000NklJKVWvli2sC8K~bjglrn|V)Jk*CcNwFm^gZ8uh68ip zay*agdEY(fyXT&FrFOeb!zgCG4q~yGuKyjTD7x8gO=jX|8x0B1|qVw}}ayT3hG@b)E zznF@}BF)auK7X*CPA8SiWpcaSB+K$9r?x9FlUiV-qoZRiw7$MhlarIQwzl?2gG1qP zm^e*h-rqJjwYs`W@WaDuHg}JUYGAjwx0KK4MHG&Xj%a3P=8?{3vtsVy;o*~ZCX+$r z>Ez@@_`}ehO7Nq@my3&wCpCBkeRXy9q|L+^`sU_F_NQ)I;UtjCeNM$d6sfyV0^71E6;oI@?apK}C2wf_bH0xY0 zCpf1RF{#%fzO=OTnTzBmc9O+n5i5qkF`@^%UkyL^-=9jQ`b%Xn7)1IuQKL|Au)2|v zk-G{n{(t3oH(4Z1?Akm?ALl!Cs+E zV0R7;FmC8xGNA7OX7ujV42(g&VD$qHB7iA5dVe-xd_Ml-Xj#$fC{<}KqI8Ixdwgm+ zz$>F8r5hMHWi;Up0oLg@2PI0r%}TBGe_;PSFmSBXbs8;d{C3@T+~dpmyzhLN8aaGE zpYV?>g}x&e2n60uO-+5n>W+_(MW3%%(C;rSERf&t$DPI&?mINKJ<(`%V{UFP&Rp{w z$VaW5EXyDF_xHc&@xIPS-1_Y9?$X}gp7`DE{nD`B!J24D<+lI> Y09gITuv&Mr3IG5A07*qoM6N<$f}azw6#xJL diff --git a/core/res/res/drawable-hdpi/stat_notify_sdcard_prepare.png b/core/res/res/drawable-hdpi/stat_notify_sdcard_prepare.png new file mode 100644 index 0000000000000000000000000000000000000000..a483ba219a3b2d7910a67f646e8582954f34a111 GIT binary patch literal 1811 zcmV+u2kiKXP)79uU-xGw>Tvcj;&w6e%tHUum2n~W=z(o zQKMXDW~S32_T9*lBi+W08*P5>+&S0Y-u}+>vuDq`rluzM?AbH-|L(TyJl$n>lmlJI~*~ee34VoommpUAvam)6=t6 z(?HT3OHWTPmX&VVvSn_=h7ER*p92s;j5@I2=j_9NLqh(vw6tt>*V)-=pKsl|6`m6! z-=02w+V6ArVZR{(hKGFjo*3-h?=vL8*w}|9GDL%&(}zSZATc5ER=;`kCaF0+X^*W~ zv10qnmoLpqHe_=+6Kl?h5#8P0QP=ozCZ%KZ=g;3hY}l~B^78WBh!G>AZxGV6)YMd4 zlb@gOMvortoLxYL%fH<~r;ldrV=73lEc$^qJcC1^p zXpx&RVS;(4s;bK5q_niuty#0iLJAd%ii%8p_wC!~?%lhGr+<9)>ecV$R>GkauYwXm zH+=Z;*c=FjaOu*euB4>IojG&HUAlD1JcUC@pX)fqSR z{g;>35&~9UULJ&3&CSiRvqp!rMn-Ue9ST^U6H2@^ZrnJxV8H_Wj7N_hJ7(bpENeqa z(4)@<$B!Rx={JVe(5+p&)~ttTUWjRaZ${5aKeA5G>lEG( z2X!BlYy`M@le)@NqwbbMUpTto-Px#2jix8LF14UaRY~J#}fCw+%;$UiKMMZ^$$v5eh0Rs#n<~u@8xdPma z7cbbOHzqKDsfz}T0$p5OY?%qiXaGfo2_vE6eZ-cZZNJ@QIU1PGU>1N(3ll2L)9 zM~{AykX*1?G+;CeJ1%F$O0F}jSFg6vUcY|byh@KO_I>vTC?RibY;2byyA!^T5emG3 zN=Ivuy}rIaoFr%!H&*xukXY3uva}(vTK}(rH6;v8o8J&Ii?Ax*FDJqXapBd86DKT$ zzEBe?vKDgl4B#F-nHMsuTs$q8p*0BslNeSj_CNcKi*|$MFv?9qL4o}@5vgqerhYYqX=b*g!tF}uF*u;qw4@nGjrPQD6!2DQVBO7PUnq^+|1>E1W$k@%B zH@i7==7fd!;K74NcmVrCu8^iB9Lk!Snnn#jgnGP|K?U2iY10StUWs`3l{``a2i59z zPy1G58}w4oQ|A68z@HFaf$Eh!98%vi=)a-jH9|=zD>Y_{SKkO&>BEN)zgOrQxCIlk z(D!)?ag{>dC188>{S8S)a(~>#YRCpjLIQ}~J@UqW8M_}I(WwRiqgd??%8 zC;yLPyzC^)I0$|7y5%o~p5)B^I_88sUe^C7zyKuc-JHgcn6v-@002ovPDHLkV1hOv Bf-(RA literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png b/core/res/res/drawable-hdpi/stat_notify_sdcard_usb.png old mode 100755 new mode 100644 index 1b49692ecdbd20c19eba320a0c9dbd00a2197f84..a5e369e2193a804ade2dd44544d4a9bea5578779 GIT binary patch delta 1213 zcmV;u1Va0j3HAw)Nq?A0L_t(|+T2)6NMuJ8z3s34e^C_wg4!xBG^h)mort)VfC^z` zaFIoaY{W$j%!EPEWiX3i2($|^Ft`;|6fwBeMnOeIiHh<6|KUIP)L5qa_3yps1SA)V zuJ^jC?z!jQx^?SW9v>g+HA(=zQhBw&g7gk7EiG+6KR<6^*MGm^$8Zz6E-eHhwnva_?@ z-akA%kj-Wj?|+?6r}gIMrh&VT7spsoP|zE;lFG`;sJ6CND3W~u1R(sfLci~^4%Yi3 z!53dH@dXV+L{0ac^X%!E5?e8i|st2TV{DZpyVb&yg_9ALF()41(Q;`y1Hm?Zq9hR zVC%YJJ*?3SN(Cl&v6R)-RTp4#j5<#jFytS^)ql>;j-gXp0)sKw#Zu1B&RoVVFE6_o z?8$hKz{<E77b5Y}#OZ5d`vRVLjl1?Q-Co~|RQqod;&yWP$)Y-yJ6)YBv| zu0&j#R1B-Z`Sq4TIRMOP9@8pP8A0Hi29}hR^drZ}M+83D zG73yPUVTR5)dJC-E|{f{0E7TGlVDMAsT)QGA}d-`z+`=81eBIBwK$laou!tR7STUF zJ@x5opTMxN-hlTOV=7|@2M07UG2wHbE`MOM@G~lE@u<#6G0@i5Mj06y)ZgDP$|BQ@ zsR`1ID^R?E0&Y2a(}r{<7(gkF+m#f!PIaFYTyo@P*e|f;uoXQjo zK?>R5-~Y+!bbc`PeN3kyD4h)I2R6QC{Z&;}^))kI=xs2QGSA8P)55|+&wtI>|Nm3x bKLQK@7+S!MTIy4=00000NkvXXu0mjfbW&5m delta 1115 zcmV-h1f=`+36%+uNq;vDE8X95ON z@TvaY)xYaky{cc;j!-B>Pm!GTMCr*Y<}wqgtE+pqv$NBEb$@mBhNqqwz7v_4V~%9S+Caf`S4{Nl78T4wI4hvDW3~CAr=1NAtV8J32i*rQO|KhGSjR((Uc-PM+dnhb4@8z20uP1ulREg27-^ zJUKa8M54Meb%5{;G90r%o)+$yES)e}CUHUteEGL?a3xl)${Is!Bxd z%*>3yB7X=n?EXB{1j`us%zpPHk`Uss00>~lBAA2YZGn-&CShGZ*T9z zGi-ifV89X4V%62v-E3Yza+J&E61$byK!z7Dxm>0k1K`Jyl%JpfaE@CVr(fN z7KORB!qJd?*Jus(nKq4tDJESTi&FAKSWAsW6@NA|omjRQ01A^MO#qzmy&aN~49iDS z3^J;`p<G{A6gBltdLUvt>_vEP& z7mKNcL)v07psN^$Uj3%0jAg|*54{3#RgA={n32Uy!4JyI%X`TReTQOpT?sd8tq_wd zS%0Y)%zmOkgko096g|bXn^M=(Dz23c^Anr?H!I|Z3-F@dfe&f#4Gj$mj#R|QPuO$A zvy$tgkX>A^~&PF~fArKG6q${m<`dY|1^%A4DZn8VHuHsgZCMG6m zY;25bYipx(CAVZDqugVaQ1+lFP|wP#sedWa%7M_Bpp#N9wzjqw*_GOCZI`6wBe_zW zinQI6Q%|wK<;wQ diff --git a/core/res/res/drawable-mdpi/stat_notify_sdcard.png b/core/res/res/drawable-mdpi/stat_notify_sdcard.png index feac3b7caafb7e8986ccbddecc69c8e40808178d..23093acff36fa82213c677a83471e7fed9435057 100644 GIT binary patch delta 489 zcmVoL_t(|+SFFPYQj(yK3Ai`9|Q%1ikek$kSuNrT{=5u?V^Kk z(5Yth75WCHFCcXE0TdJm9Yj>9;N)M#-!$h!i%@U9S6ZPTgu^Ad=S$A{zH>t?%Ywg# z18xB6r#IKxZ-ZN6C=rHv&L$*qMK*48CPVHkaIpsr_+Yr z)TdxDNIV`7w|`W(+bz^;HF8m1_yvByzk%J*hG}A2w3I%Mv}>7 zXha|Mdc9vEA*|V@>$-&|6M;P$pwVa$ZpXJ;Em}HJ67Ja*i^U9=%f&Po3+NXvl4vw) z*vTtcM$yJ|li=Iqbvz!0Z6iDLHR6D*}l=d^weNgxn_`Fzet z5|78gG1aDhx9KL3U2L~ z!N1V{okF3rU7ZK?6jT(yjrLw?hqf`kOR3Pa+>qquym!vI??u|}cJSBm zzzN_z^q^EKDbwlnX*?b)$37B?L|#Lo&_%soe`AsOd_EJ2Qh!(>5C}jnmxETTMfYJc znLx2vgl4k|{eB;My`I|bcAs(BIZLh-BArfyVHgmP$3fFHnlY5iWk@6vkj-Wx7z{$C zQh|Iv4`&FrC+qbZP^$g4NL?P000>X1^@s6#OZ}&0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#xJg7oRCwCVR!K-(Q53yNoToV89F1TQ zQPBn`gsOGp5xXodf(TvLg1B>|hy#U!8Y~7PqT-Bko^Xok zJ(vEHM57I*r58Rg|NZyhdH0-i?~lsma?#%oHT{DK@b#dgqT;Q?;i$T~xq0^JCIJDn z@$vDW$H&LJ{Q`-NjcqC~FE^&8rP1Z(C545BQF?kht*)-p`T6;;`<0ayT3cH)&d<-| zwQj%Y3Jwl7wzs#FUazP6`g%%8NTBTOY#H6}lai9Ct*woMf`W{GYob!AWL#QWBA8=+ zeck8izTPj8)6-Mg#OZYY)_8q=?H@=`Y!hIy$;D1_lOFbab@Ge0X@cPY{)N zo#f``npo6#F)=Z!(9lqiXPKFql%JnZ7Z(?Fe0)qHAt5v}GD3xgg_M(%Lnf2yxmK(F zGBq{j^a+9tnA`Vo4mNO)h=>SkZf>T5fdPV()M_<#c6P$Pl#-G{Jv}|Ny}gZjYh+~P z%gM<}>%A6cN0COO5fNcq_sGi1qK%CW(SWn1lamt~92}Hqys3cZ<>k@s?d=m@^O2{^ z@71KBpgacWS9sI9G~;^Jc3+uNh9tu3-zt;D8~ zYDb~M45$@!g5~99IygAc9v&W=S*K5&-TuPD!txyuerN&>N^unx6_MF&#>+wptcvHz zuA!kpwA$a_r{3OP+T7ff4EcavoJ|+&0}1pVAj!$e;x16A2oLT72(A@iKB*KR0Dks4 zii(P&-Q8U=2HwF13VAQB+PjtD!U+_?@tZrWI0~ELq$ogW1HqM;nVAs~tcQLEgF&nf zFpo^IDK>GBv9U3#tE&^5VBzWMX%QYk)z#J1*w`q56B84%A+%zE@2u5Vt{cbV;-cNd zU3>ze%j;V~m6esClFG`;sK38onkMK3H8?r4M}5KCsi~<>&b(-7Xz2c81kc{x6m!GF z!va=XS}HC=7Ty8=0c^9`9DHl@`O(tpbX%YW)r=P5-dU@vs%Ug{R4BtiU|k3gdibM7 zY*k`vkXaHhf5q2_dqM1WyQQO}L(kN_fSbJzAS1+8D!rwpg%T4JQ9~ydizN~r0o|LM zr{>X$e<=8CX<**XoY6*KU*BtGzO}X0%*FY1XJ_XP*UYy+0{L(M68#Wh0BLUlSyh?H QqW}N^07*qoM6N<$g1Z*{Pyhe` literal 0 HcmV?d00001 diff --git a/core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png b/core/res/res/drawable-mdpi/stat_notify_sdcard_usb.png index 6de4043b953848815cecc65d74b4dda3b33df1df..9880694fb6014e3622dcc4c849fb591e807377dc 100644 GIT binary patch delta 720 zcmV;>0x$i*1&s!fNq?_NL_t(|+SFD(YhpnZy-%aT7+4Z9sHh=Uk`&R#E`rSpRu&>y zZD6(V4=llA^BR}@fPh^{C#2Xibyl#@MhK)y5u%Aik|Ibn`0dUacw*j{Yq1M^;c?&0 zbMCqK+%q!@)9IA{wi)Oj*oxMNa5#MQ^70ZHjYgjr23c9D*?;Z!i&Cj{vJ}YX=4SHX z;2`Mnc&Oj+)7sh^dA(k0G#d2&{yrPu-`~^2!$a`q<_617mZEEQbv2mDWN3SPo8s{} zZEbCl-|y#se(Z2KD4kA|*=!Cj-4j6&xWBu*BZ%Yi@p0y1?RFc9@QT*g*C`MPVA`=1 zU7b#c2OW>c3V&}f80h)=nWE7sr%tl7v$H3bT$T0bTe)2Rr3(@Yg+!~>%7Y?fxi^_i zbaiz_J3BkHv9ZC&u;Fk>udlBm=6|xGZN`dxpX}}JiHw5pY_VXmSX8TwL?TqFR5)Fz zDi(|J`OC{onoK5KD8*t?P^|A=WDeZ)$4Ws zO|vJ+3=7e8WTRyWf&?US%p2zA$$bFX-{0pR&Ah$6)dd0nS|IqQ337URDl#V~lgX(T zRT2m)RXg`EuUm;^*Vosaxvc<0Av~DH;?O&qb0t^7$)R*HCd0V0lcq9Xp*>@4rh5AXC$$b$?Vv+kaL zX1+T+D|0v;;9r{rp1__7E%^O@c0QlqO{Y`#(vN5~ntPQ>b$?r}R=Zb0q*7^(fNqEf zg+c*NrxV)kHqOIrHUpo}2d!2M27>|g`+aM#*ZWMq_VOyZZit!9W{AaNpwsEV?RI0t z5DtgIU@(B)ZU?1O3GsLwJRT3cAa=D}o6QD@RCIjF*XwoagTdedGaHRYz%a}g65NMI zqfr%vtk-MU?SFQF)pyP(lSvxTST3uOAaAOxd9?f3irSqpNTpJAoJb^~*=$lZ z%H=Y1k_p+w2NDH~aIB=qO5^pMtU_{gGM+$4y|Y@a7JtU$F^D)He+Kb-y$zJ2R4Tbq z_e*vTf(5_}NvG2u0{Tdz5Cy^g5tzJ7#$Tv0AO4$ccYltJN-o z@J>N17K_wpGMQuBA-xZV!(o>fLhhcoHk)l12n61U$;9Ds(1%BnZ{#L@FW80u%YQ3R c0{Je$0GGXTcj`^-EdT%j07*qoM6N<$f+EE*VgLXD diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 8807665480716..52e3200211ebc 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1193,4 +1193,5 @@ can be seen. --> + diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index f85d931ec3540..204389e8601da 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -313,7 +313,7 @@ class MountService extends IMountService.Stub { setMediaStorageNotification( com.android.internal.R.string.ext_media_safe_unmount_notification_title, com.android.internal.R.string.ext_media_safe_unmount_notification_message, - com.android.internal.R.drawable.stat_notify_sim_toolkit, + com.android.internal.R.drawable.stat_notify_sdcard, true, true, null); mShowSafeUnmountNotificationWhenUnmounted = false; } else { @@ -333,7 +333,7 @@ class MountService extends IMountService.Stub { setMediaStorageNotification( com.android.internal.R.string.ext_media_checking_notification_title, com.android.internal.R.string.ext_media_checking_notification_message, - com.android.internal.R.drawable.stat_notify_sim_toolkit, + com.android.internal.R.drawable.stat_notify_sdcard_prepare, true, false, null); updateUsbMassStorageNotification(true, false);