From 9f87cb2f8d796f57054c1c0f0ce4b9bef9414642 Mon Sep 17 00:00:00 2001
From: johnwang <johnwang@google.com>
Date: Tue, 25 Aug 2009 15:25:37 -0700
Subject: [PATCH] Simplify data icons of CDMA in status bar.

Use 3G icons when connect to EvDO, use 1x icons when connected to 1x, and remove dormant state display.
---
 .../drawable/stat_sys_data_connected_1x.png   | Bin 0 -> 892 bytes
 .../stat_sys_data_connected_1xrtt.png         | Bin 984 -> 0 bytes
 .../drawable/stat_sys_data_connected_evdo.png | Bin 995 -> 0 bytes
 .../drawable/stat_sys_data_dormant_1xrtt.png  | Bin 1081 -> 0 bytes
 .../drawable/stat_sys_data_dormant_evdo.png   | Bin 1008 -> 0 bytes
 core/res/res/drawable/stat_sys_data_in_1x.png | Bin 0 -> 808 bytes
 .../res/drawable/stat_sys_data_in_1xrtt.png   | Bin 948 -> 0 bytes
 .../res/drawable/stat_sys_data_in_evdo.png    | Bin 967 -> 0 bytes
 .../drawable/stat_sys_data_inandout_1x.png    | Bin 0 -> 770 bytes
 .../drawable/stat_sys_data_inandout_1xrtt.png | Bin 942 -> 0 bytes
 .../drawable/stat_sys_data_inandout_evdo.png  | Bin 960 -> 0 bytes
 .../res/res/drawable/stat_sys_data_out_1x.png | Bin 0 -> 820 bytes
 .../res/drawable/stat_sys_data_out_1xrtt.png  | Bin 942 -> 0 bytes
 .../res/drawable/stat_sys_data_out_evdo.png   | Bin 963 -> 0 bytes
 .../server/status/StatusBarPolicy.java        |  27 ++++++------------
 15 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 core/res/res/drawable/stat_sys_data_connected_1x.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_connected_1xrtt.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_connected_evdo.png
 delete mode 100755 core/res/res/drawable/stat_sys_data_dormant_1xrtt.png
 delete mode 100755 core/res/res/drawable/stat_sys_data_dormant_evdo.png
 create mode 100644 core/res/res/drawable/stat_sys_data_in_1x.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_in_1xrtt.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_in_evdo.png
 create mode 100644 core/res/res/drawable/stat_sys_data_inandout_1x.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_inandout_1xrtt.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_inandout_evdo.png
 create mode 100644 core/res/res/drawable/stat_sys_data_out_1x.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_out_1xrtt.png
 delete mode 100644 core/res/res/drawable/stat_sys_data_out_evdo.png

diff --git a/core/res/res/drawable/stat_sys_data_connected_1x.png b/core/res/res/drawable/stat_sys_data_connected_1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..130724fd05507a297d8a2b36a5a86ef407d8170d
GIT binary patch
literal 892
zcmV-?1B3jDP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#9!W$&RCwCdRzXV}Q4pSl1a=|fE~N05
zHqr%)Y_Nw2Dg;VTfzsTnc=1#yxoA&{2ai<{QU&QBP$+^2?ZH!^AV?viLPQMip#=}M
zM5vGzgk9W~?VE{Nvzm?Z&_dtlG4IXp%=hM-c|$_3>%!k2VfY6lQeUKBq+c3mM&5Sp
zfrmPYMxwh?T$(C=D{i#}k!5*Rd8DvTsS~2nXxjj`ZNs^7K43Z4D&HzCL8O?(L_s71
zGnotw4-b=mZEXz-g+egj;V{UO45nqWwsYb*4qRPbd3yvyU8`yGr>(^EaPc%0{>H`z
zjE;`_C>a?Uf#v08NF)-pM~QpXgH^M?KN6?*Av&nfMv$GI9a_)K%s^LH7fBqbCjhIR
zNGywhE-x>=Ss%DQI5>dG$w}JJ&CQXVo}MN>+EuER`%Bn6O{jSV)$?^be-yQA6Hro1
zx>ci!UU%h~JawcWZ8fDUD3YF@9#~vlr2W{~7|DD-PkOYIJ7iE23Ic)3)BzzTtlpu^
zG<k)X!E_A{4$?Z8%R#wZCW(Xe+^*_W!7DO>|004{(xH0qO82K-eCaw5?`5GT9Ak8)
zy;8`R6R|`5B}vlb%Fjw*Ick~)x~{i}>@-PysyFpceWosP4MQOPhwgKjdY&S_E&k|-
ze!UnI!MreG|8T!G$o!}ILSygAzRtQ>)&hUDlm=?IiadkXtx**s5CSH<lK>q&2aW*S
zd)xFq(baHqB0<rX4oe_LL;^s^q9~G~novPe6p-UGY<}J3Jl9Ums|if!roA+-Bds{a
zo>bf}LUFGM<GFF~)$E7a8|!OY48x!Z&4}rvswD^}A1UxIs$By$E)3f9Y6K;&fN9^H
zIGf2r<*b5L<)bUyDiU-?0M}88QPF#c5hDGlLn@I*_LPzSb}tJAp<Z?^(dhK#6xb66
z)!$W5xAJ)fj*pLl#Tn?|by)bg;FZ7c8sKGYHW_0lysTZGP?uL#Z3=fKC)}NQKY<sy
zrsv<I9opA@g@XRA480k8)z{m%1W{lQ?EpMar+Qg`yZ&Xp;A<=Y{a>O#0t^5y^xw&?
SmvT-30000<MNUMnLSTYM@t3Ip

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/stat_sys_data_connected_1xrtt.png b/core/res/res/drawable/stat_sys_data_connected_1xrtt.png
deleted file mode 100644
index c2fbbdfbc4faf315a2292bf6a6103875eca70da2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 984
zcmV;}11J26P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?;p!5L=M|00US_L_t(Y$K96CYaC@5$3Hte8{ao<U>0J17h7;3LMOz-77V5cg@T~H
zS!i;~K@d;%5DNYQ(vy;t*J2M+NOGvxf>01-R}CbG2y;*fwi`BJ;%t(JdD3}z$HOGE
z*(A-zYae)dUY_@v_xnEI=LZ9?ixiGFQy)&<Xm7Q@5i64lg&<s5yXtpu)cdOOOXKIW
zK-{BErBYd_zF9RDuYytvv4V0hphbw<(WF>e0IKJLcxBIMrFroEgZyxAZjPjrFr<dq
z-`;2UU>8z&$xAw&4!g-N#bS}+;bBx)nOD)}oHWeL%;fuxjSZqGqS<V+AMYcvAd;;l
zNwQbE?!cVn9%2Oq(lkBgw6wI8KVWfj5rFCGX#frm4saZYq?<4}5}N@z$4sv4;y6xz
z;Ss={={q=%L!nThSS)4$!e9^)0Sle9)5EovZnt|zNfzjKyQFDKr_-U(DbR{q7XYyt
z*T?DVcDs~HrGcEsNemW(t3hgvNzG;RTW~eFaVA|uZwyf^7JDyn9Fio-b22+S+n1vw
z9|ZJ>#=qh-9*pA~e^Qmz!s%xGU@FyGW2%NENhp;{c?AuU?X7L%Bu1BXrqRSUrtxc|
z&{tj9EbP6#JzUpiXJ@DHB8hutd+Du9ME^$l*^xcAai)p0YCT!PdPHw{p7(a^d8^Oi
zxCB8!7=}Fi``O^|>=}Jho2Y&6zw1B5#k8Kc2>%KR!!UQOy;oyA7)KDowSK!UYvLC%
zt81(0gUo+7|K#}Wx%J7dR3saMK`p=^^HHuM7z;qif&4L_%18yV!s>DlL^y-4ld`h5
zf_61QEg%>R&{`u1{uQ5UwMu2Q!qcCgW_BxhWsk^4XmnqG&IQ3{39L8j)R*hr{o-zZ
zbpPx7y{`{xX}8-T5W8_7Rp)|;6_i!Ixt3(0?H6st3fJGijyLM%c7U57-K4$MW@UM$
zk1prDNW@A8a2S;?>HMtTsH2sJ5@?+@qW_Lhy;0AH?LZI_$+cKvv$=`6Y>57ea@(UH
z9<jc@ju|zCe}>F|JD->TtJ<JXj4{pHL@iZil`8jesnZ&l^xl{EQWTlJtkT*<Ej7k8
zPmPt6a{JTUA77ie_K*_h|Nc0{NxT{U5q|dg$Hz~2t>iy>VY|k3niK&50000<MNUMn
GLSTZ=aL?iZ

diff --git a/core/res/res/drawable/stat_sys_data_connected_evdo.png b/core/res/res/drawable/stat_sys_data_connected_evdo.png
deleted file mode 100644
index db9f282e7b970a911ce78feb1e0a1d00a5ca6659..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?Qux2{pI?00U!5L_t(Y$K90AYa2%t$3L@LiJfYdXu*XQZJ-P8VS{^6poWB!mO!D+
ztpP9CX%2<rQ+f*I4+uH6_>@1uhmbVrkX{3YK%mGFgMDye3oRHL7n?Mo1^?KwG}832
z)=IJ*+4Pt%Ebr}myYqeT&36Xg6^Oob`LoNPCvTD;l~%J34hqGYt?j(5PF3%&{I>Gq
zBoe#tc%Jv9_I}MjS2;(yTt;byV>_o?rD!FsS*6tzpf<4+V~iP2EG#S_grHC;P$(2w
zUS7^~Q4|4CsZ=;PIG`-cq$=g{&yU5#P5^Fwdy9fypx5i6wFW?IO`m^$ex7c(OQX>s
ziXwJ*cWE>l0Nh--dHUv<A<WIqooJ&dGEo$b<@)~H)*k7kKZZW~RrX<77Ts?5|I5rA
z!{XxNSf#_A9*<xB;;K1S!q>jMW*pn0SS(@}ZHzGpA#hz6fc^b_gb@9LFveh6769!|
zo7X$9Ns@$C(gK^8p6lI>|A=3Vj!T0=alU$<UayxgrnRQsZX<-iahwrB00<$lEgM;p
zcomOYtwy?=&MF3y&PmcV#dTdQ%gPr3Xt&z{bh}*+4-XMSP%4#1lxHxcX$nP1J1NqU
zpz+5yUc;W+L;bA~gDKMKbdc{!bVp+sZKRa+dOb>|QeHsPO0q(AnpskmR^#fD75PuK
zTK!=A)%M5-07_-=VHgs}@!6E5PmpkZrv82Kaj=Yyzx`^P_^)_m!TKk4E`}FTDB_LL
zxO64yUdsB$`ec%&2TRX}@1E;lUpGo+mta^A38n)a+aa6|L6H*$(*a(^LutkO>VQO{
zPCksoSld`b+LEvy5>AImDN!hb3jwuS4R6Zh`LEBjxK>o%DlOeYB1iUTA_+R%z~)Mm
z=4zAMi?{RC{d@NZe;<t{NfJ<y+UdxsCXy(vaI};AbTZOpFF|R=l~1owovP;XqXSLy
zCSh%LZDd^5q)wDp8NpFkvMBRhbETP`hayNR2`&T#9|bg5n%O@?0(~n<U$#nRL_1qM
z_#gVT{%z&4M-Lydxw(ly<rDuIv-HzaF8|}l;6(Vozg3^98^?8wV;?=vxW&fY`QeVi
zA&a|?sn67n@B3S07vyo=_~yn}mu4<4Qyg3mXGPjccjDjU@1Fkh^cn9I{sYzJ59FbT
Rcf0@q002ovPDHLkV1np(&x!y5

diff --git a/core/res/res/drawable/stat_sys_data_dormant_1xrtt.png b/core/res/res/drawable/stat_sys_data_dormant_1xrtt.png
deleted file mode 100755
index 11c2eaebb1ab1613278bffa3ddeb6b996e69c1e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1081
zcmV-91jhS`P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM#
z3<4u3EEV(s00X&6L_t(Y$K96CZyQAv$3OeSX4XlXb)1B?S`e-T)FlG7hmas3s255l
z4peG#$^nT}IYp893s4XI4HZ3ABsr8qFKt1hm5^LGRH`7_mWD>ONo}b~Z6~pJ?48}^
zu*CTthijj-dZU@A`M&pk-<er>QA}GO48K1-Qdz2eBb6K!2qcmNdsF;w_u5|-el6VI
z4a8g@q|@oCY+u$%+i8RlNF@>G0lbuyE9F6{<P?zI7sT$g9ZOhT{PtpNabjWuKk!M4
zB(>!lD~%P1ph=S;2w3q~FbsoKDuoDzvlm_Z_KC5vvDSETaglPl%)-I~HLr&BBvQto
z@B49<rrEY9tq7?kNQk0nN6^g7Oe=xu>1hB)M@Io@G#co-jvxB8uSCT_`lcz<G|_dv
zwc$FzxzTgzx{ju47={r8NZNx)DM3LH1sk|Z5r*L|lGF&pkSK}>f&eYhD3*%{08ug5
zo9PO}kVGQUmUGYdKtcXkK5`r<a*jB^<&Wh@cBL!%QWC>3HZst4eBW>NWPE&lOOMuL
zkYIIL<X*{fJb#>=lN%JBVru7M92$-+%fiVz_`Xjfk!UHXoh>gd<M|#|!iqf>p7JQ%
zDQH{Ng^J5wU0uaAO{&%EmW`yhA>00!`zb#!x7OC@J>|t7FIMYz30qy(qHWuUi%*JM
z0ybMdpT~7w9{=;WeR*n^b8=$f#22~ObC)o2icgBTb1tsyV*VG>)01Xo<U`JXd7dB$
zP`=`Mxy++Se=~dU9>3hYiLh-<k=OyE?Ul%xPtHW{Lznrv`S{wgZ6+rt8F*`eAFf_S
zH%*RocXQ~-VH#5M-Q~-yd37wqis?l%KR3UvC)@1qA9t}#3#T`}l9nn<D5bD0iyyCD
zW3^i0Xg147r%v&~$EO(@dXF2|Zy=L$OMmtSLB$R1IMe|^m)%7wl_Cfua>)b_!jQRA
ziC3RK<<stNGW{9+$fqfrXxj+d6GSSBP=Ymo4FJ(0h@uExgJ)4h9Y`7mJ(&!i=TWUx
zY5GmVFhuC_J9D5)BoZTx4`;1bqp6xGrO3VUCQe^J@4oXk&cFb3e?6dZ`xeq~KqCUN
zhq`uDA|*ly>aq?%A}}#EgG_IRuP<C62t$g+BKPkUxb@S|EV%a(DM8)bbgQ>hm*Y4p
z+nY6JAI<_`ga$o*J#=<-f)){~h-T2FQhvsYS0||%Xu1xjLH@No#ie3UDwWKALC$`5
z_Vmetlb1-~{NEo3&-Y61pYG>ZzQ1yv7s~zxG4jra&x<}u00000NkvXXu0mjfspRTf

diff --git a/core/res/res/drawable/stat_sys_data_dormant_evdo.png b/core/res/res/drawable/stat_sys_data_dormant_evdo.png
deleted file mode 100755
index 811fcb56f8ae74837d6b31f96bcb904d3c57e87e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1008
zcmV<M0}uR(P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM#
z3<4)0LDB6100VGIL_t(Y$K8})Xj^p@$3MxvEx+3|>rK**gcY%Zx?oT?L|0KKd(hch
z$NEsg!eFwe3BDA3@LBpgR`#TX!Jz8;Fz3c#n}Qn%6_Jgh<#sNv51YGzl_hQ3{C-V-
zxz~qmP1F2Yr*AtizjN+6zxzGsd(Qd6(;|UK%HW%WpXC?xlS-?QK%h`;`836<-D`g_
z`^)T9GZ6EU5{X2PCHfM<h#f%)fzk?LZsAmlTs{|4S{(!0gV^16&=M9yBSVZH9Bl|Z
z^2rfSe05@72kLC8WUv)o4UT32|5w&4QCfkjImSO8uX%O-C8^|wn^jwB^>`38s0}F7
z-%MA*#>VTuuP3B8*{v~ZbSb48GOqifhQe~8R@uYY!g2vLxH<R9=^FlUxE^!^J%<h-
z0<STV<j$m@%jdx4w@7#7b7$VU+Lo>h=PuM`GyLu_GpA=5`)G^<BL~*2m^nQI3aqe2
zBpe};NFWRHHHG>PNYv3Kr34M>uhUIS&dD6<Q)#A-*H&Tb_!Q|=X_Qt-S#7>7ODtg_
zOc8I~_*Vyg1Wo($Uqore_1~`t>gck<R>ih$!@c9S9LHobiQ_n1L(xszxhu8ngMsG<
zPGS;w@3=S_2gh+RABIGu5%%tVo1>o|rBbP&%bEwd9Jg=(&D@O}{CxQ`!nQF*M*~Qp
zRU$+05Bbh5hlR{S_1Up)CMG6Gy_DjIvu6pKCjC7<Z0p~_no@i_J<W<NVi{JIE))xy
zg}|o4te0zlT*ERg;=R@WE#?=|T4Pxj=gyy}u$1SyM1ptr?c=TY_OoZt8(g}03DsGp
zT58#B`WrcwNJ85}0EF!@U0q#NJfDHi4sLoLnQWG4?%iXgr-#_~7-hdqNtFm}BFJnv
z9YPCM$}0efkihqSf&sYi`xJpr!yp=qA*Ey~zeK5A!t*>tP}J>Q+e#D)!!rO_U0tQ5
zOK7bbc;Q9jecO5cm6wU9Qe^(R$?VlDsPY=D`D|W=)|DuQ5Q3sA0?<)0F#`s%-WXp_
zPEzqaT-Rm(*IBOo_!D=Xc|@0>Xl{6F9yeX_c>HdnH?d>x)*JwaXAtd+(jDrCfRCqr
zN|h4%+<lg1k<NfYAQ%MGAo*+(chUVPo6YvO1sOd!x_@_S_ena4Kk2s1vdlVvI)~4E
ef94`jmHZ1H$De7s`i%Sl0000<MNUMnLSTZbN!Y0X

diff --git a/core/res/res/drawable/stat_sys_data_in_1x.png b/core/res/res/drawable/stat_sys_data_in_1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3155e632fe7b45182bdd92595890c6ca4482778f
GIT binary patch
literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%1J~)RCwCdR=sN?K@@+xtVvV|S|n&h
zE6Il%u-Y_%s|1@gA*4wq99r0h6lqfkR{0BZmKMPxO)M-7Nt2`s@q+|nAqoc}AC-t-
zd-I!Pm)$jP;=vu<gU8H!Gtb|fH@`QlpePFcZ4v1oh@?(7H#fgMKR;(jqmevyrlNSW
zu&{7&b#--N3F30O@@%8W?RJyRX8STgzu%{~w>O!Md1iVoLFVV@J#%w&$ckdI813xr
zaR2G)DHV%Ft5XmX>vp@IPwxZ-V5OqLU_is+P}=}7_^cFhRs<6D$5!?1?2PvI_6#N2
z-QA^JE=PX9pW7H=!>`6o1!4}u{QCNu&yS9dC=dwn5d!~IAiZACpsHYgcXvno`}^F^
zWHNj_JUrxntiQaxd`@A22!b$?K@ikmFR;}$+)F4FQr_R+Ii(qq4r;a9#Z)I*Sy`du
z<6~~8(`i0tvsv!Py3^?-pU+3DtE;rMv?SZ@_WW46%m8MPjg1XHPbQO8sZ{s~fnOg3
zW}+2lW@a=>3o7+wSyr%Ub%E0eN_l&GD;VyC9k<Pz%GYYO#%iw$O7rmW@MVy(i(g+~
z{~inme@K$#X*Qem^z=madR^NX4u^TYalzGURr8;moS+KGni7eG=GQm0FsW1H@wn1x
zG}Ht*h{NHaPN%~`?(gsU+T-J+7PGv(Yye@28p~xCMnC>8MWaz#TU(>q*;yXQm_v(;
zi~PMRl}d&fJy~$#v2uOX8vsEWps7^qcYq{m-9D+G%pem#T4p-q6i_r9?0h~??RMJ`
z0~>yG3y4<i(7$5<z;_0(0_?4=ExNqCG{nG$AM1K{iB{!Oe-Mf+aUZX*ubPjMgUaPH
z-;WWtK92O?k&o2t^|lzR6xKfq>t0JeKR?&z*pE2GtG_jo!rR;1@kk`X`{ob2{U>{R
m5`{vcXxS(K-Cv?#0t^6M7Z@99v3Jq{0000<MNUMnLSTYUX@8Oc

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/stat_sys_data_in_1xrtt.png b/core/res/res/drawable/stat_sys_data_in_1xrtt.png
deleted file mode 100644
index a421a8a45bba4949a082058b77d81201c11b172f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 948
zcmV;l155mgP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?!L}(*`pD00T5hL_t(Y$K6#iODjth{&q4O-2{V+M6!vcXqLEO6%dPCnkI#fHa3Fb
zKe&Iu?)?Zab|H<Wudv7?2;RG;Mo}<@WI<RoB4ndGJ2S7^!8I}0+uj2MhjY$%zS%S9
zoCW?C(PCwNef^v7`~L_bs(+e<5b`UZ&woEVJNs{(pT^4U>}(^S&lhsJ94Murl#Wd}
z91Z~hx~?M#0vLvYe!pL3j5PpQ6G<|eOaTCnj*gUbdwUxIAf*H$1eRr?-|r)z&jSF0
zAb_sxn4X@7VHkx^zcf}-sT5MF6!!M^lv7FxDJ1|v2m#OY006%4!}on~&e8ApK?qTC
z6G<3jAcWxM<z*zO*=(ZOY>w#fv5c{=k$eoKltR~a?Ck6)0sz?B+Jb4C0DyElt?*wW
z3BwR!7%C^{9H~?)VT<j9!2r2j4q+HV2!Y4P$FG0M`x{9q@%s8Y0*Z;_PJ4TMgAf9?
zZA;6tWT{m8Y1{U<u_Wnq8Z$F9iE^2ynJ80SHbMwE=kc6iZf*{xQVHd98O36;Y8Xai
zWEj`h*5ty%0yIq<+bL2?P)ea`8iWuagdmC{RlebHh{0f>Vi{vNKR?$Ja}q@n9v&W4
zxpKK20KhN|m9*FEDN<e6Cq8z3fdol5oApf7EcJRlL{S9a_eX%s%geaAxl!*hNyd^m
zj<dJ8xcGxoTDZTz$KBl>uCK3EV5L$)xm<=20-a7r*$)p7QLR?tx-NEicM}~r@+Kc;
zV`D>hyWRK#s8lM*WHJbX0G&<;7Z(=*fZN+!g;`o!N|1EB-Q=5ml&h;N5JIrJx(eI2
zF*P*>&N+(3BIf7kVVWjRPfrt=_wyu#7%kUFiPwzlx^P_=`}_N<tq%?kKE;e9A)k@N
z(;pwsIXLHdett$6hG;YzYGKCWc^(>##>nO%le**m7T}yi*L7%`2F4ib^*Y+^b^_CG
zw^6Ux!5B+)7nxM9I3Z&Up68)hEaK_uN!e<(8d|Lu0HD=sp;oIUaK9DHvU-l=$ZR$%
z)9LiYb8>Q`^lUaO9mkQDW%YjB!ke3$wUw2XAC%I<pZ@csD0;ZOyxcuLKK>VfmHZEV
W@5wqm*>rIL0000<MNUMnLSTZlfTJk@

diff --git a/core/res/res/drawable/stat_sys_data_in_evdo.png b/core/res/res/drawable/stat_sys_data_in_evdo.png
deleted file mode 100644
index 54f55bac0ad88c3e1e3f3cd27880f4e19f452059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?8qPUGowE00T!!L_t(Y$K6#uPby0oerDKR4Py)x7~r<Xk06N^4aF&;p|C)r1&PT`
z{0HX`*xjFC;VC6FmfpgG6Jm3=R3w^6Vc3LdB1=@%otd3m+`E(ABf>rHd6UUb-gln&
z<Jo6+f#1bQuqhUcUmhMF{_=gl@T*BEr9V=s)YtR#^Y4@5MzBdF5{*<Ul};v;FijHx
zAcTNn=p*2qV>}*%F{b^Ta}0;W0_VH|ATxCmrIZQ>wzs#DNF)FNuIr-NY(`?C<{*T?
z+uIwCkB`aJNdTZ;ufz9!c%G+|$6_%ZuhnW$N}<_o>OzNyhX8<`ot@dds*qKy)rrq~
zy*@FvySuA?X5!OH!ZZNT6j4e60I#pF9}>i3F>ucRpF-46R;$%?r$N`@NvqYWKBJUU
z#bQy-lyIq3Qt@~klu{5vpp*io6sBqFPA$s<=N!K8>$qVU7>~!ezrTm;x^P_=l+quI
zi;G{o-R}1YUGaDvu~-a-Vdx}*jQ^VyQc5VLKnMXL1e8(;At0p$V+@Qjq|<3UKR*|w
zlv>g>C^8rfKnT%^0O*M<%fe_hf|N2sgYWxTSXjWz%L_cugXejWQeu979+qXLKfHJ$
z1O|hFrY5*>qtQqweR_I=X__!i6O1wVz8}GaEnpy0gfZqMlgU5&{XT>ccz=KY09;*N
z#r5?y0AM&AP8HI`BKds&&*kOiZ-!x{@9yq!dwYv+x2q54ayhK6t-<$wbUGdFKRP->
zp-_Nr+t}ON)BZ5E<g-pnrIPCPdO-uo<#LF};~0;}=yW=`xVQiS+}zw~%*x72q)4yV
zBOfkf*siXwKq<xM<|fwH*D*IY2Pq}8*({cpmXJ&)advhV!33Y9Kok>ieAqbWpp?S4
zZP>Pr{r&xa0fvEtgM&{olZw#KiUg7jOH)b-*LC4}9vY1X9LI@Z9LGVU(a@NgMT8LG
zoa-f}glU=}gn)C7N~MB!yB)!_+ig@T6>!cY>Y~%=3KDY8;W!Sm*(@F(AGNPsE~C|I
z0RUR97Ru#v1UJ(%nM^;Q&nw25vMg)rIz2trd&Zc`=kqF)$@FJRcx!8`ys@$I%`lAg
pum1Ce5QEFh%e|A6lfUs>*+13C9W<Z}!;=62002ovPDHLkV1k||z$5?w

diff --git a/core/res/res/drawable/stat_sys_data_inandout_1x.png b/core/res/res/drawable/stat_sys_data_inandout_1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1017e3bb416621019dbab402d684198fe9418e50
GIT binary patch
literal 770
zcmV+d1O5DoP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!q)9|URCwCdRy}B9K@grN8e#;Epr8>I
zM2U#DFBXBTf>#H%u@c0_R#K!*5zr=8s^D2#gcNCFCrU)TRDzf)jht{GqNV?PI}7`G
zFZ!P6!5!SdFgxGu?Cj3Y?0W(s1pYSZ;2)5l56;iezYK@N!g{?H_ui>a_uX!{U%kG*
z)-{71A0JofM2FRC1%tux+W{7f1&qgIk;)2Hoti<+X0zk)@DO(e7Z(>0kH;DQ`1lCb
zYE|nLfE$}mr;eR>f(1ZR1<U0UR;!gX0fQl?#ptJ1Ksx!cIX^!?Ln@V0q$HV4Lb+T9
zx7*Ehl&B-l{q_p-*$Kz(cAJfFZf?Ni@i2*m_+CNg^SOdK;keW3Kt7*m`t9v4lh@bR
z3`hHDG}>Ll7(@^R)e1tw{L2Y-Zo_*Cg+gR9nXr<kg>=>H_3C?_<n;6u?(XiGp3CK!
zEEEb1N4v>n0+-7L!C(+hPEJIl(OB6?*XIDAgPfh6v2iw=g>JXYBog9sAFNDlg@c0w
zsiXy7dZH*2G-_SoK7^@!dwUZUC!xn3*laeoli6&xm5arqs%;x@Tzn)F$@u;LZ+gAn
z(eL-+<KqL~-`}N)4-XFzjYi@A{vI-!jD(j;CCmcu8q(>sgv%S6b?P>b#bP872rzE7
zT0~B$bDNwvhV1kC2wzJz2<>R%^?FIO*(BQtakR?`b<XI|*V1dfuK4&R5(%ac1_Q~4
zrK;6Wyl-}XwA9L(+bWfcA~4?w;u}6{>7pG=EEbEza^hH{(NN&1a~t~ayc627gnr1#
z(a{m(dc7_!#4+Srt;TSa978|!-x<W|bpD`aO=$lR+P#|m^70~$aX$K?KVM5w``BDw
zUVaUS!>n)qpxb}arzidN^i)+mEC2m3(Jui80Q(=);EOwi-2eap07*qoM6N<$g7c1b
AfB*mh

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/stat_sys_data_inandout_1xrtt.png b/core/res/res/drawable/stat_sys_data_inandout_1xrtt.png
deleted file mode 100644
index 1a94cdfe0b6f57f7ddb895c9c9ed3b93be452eb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?+?*$!k3T00S;bL_t(Y$K6%WOXE%y|0HetBe6*;6dFSbhy@GwS`-g^bgv%Nv*6j|
z{t<ih;7QtRtOt+otyl>4`}Hb#Q4m?liU?w*>15KpJtZ`@Yu)R9;K9r1&CF-sdovT@
zUx5%g>+9=Zo}Qk*hhf<G+eJiC{J&HxeRCY=d|EsmIl8XfrBbO}EEXY2(jOP(oC5%c
z!yyWV0yyXB_xlac^K1adha#$~mUForn$2b$+}YWIAjHW+Q4|mnR8<9I44iW?#vqC!
zR8=kiG1JH)B7|Xx?d@&6=OXL(`xp!ca9tOibA(|C&N))46o?2jML6f+oF_^p2m&&h
z4BG8B+U+&~;Q07B_C3#=DC4I@#s?D-eBY0=ix!W*v)L?kT}KcEABv>MMFc@WDwV=m
zpTHOcV=OU=h#&|8hQlEM!1sMTKR<sylkrBsyu4t3ejbXVOiYY~eBZ}tG(s4LsMTs@
z7zUZ9`CqM8`!ZD|m&-vE#qskG*LBfqwGw4IIXQtK2=T#?BngV5z%)%PFE3+ZVWE-F
z=k1BhxVE-Ng+c+ErXicn0stgQg75qBNgB^m6h&y72F4f$g8?2N9}`(}&T(;ZAtZVd
z1OYtHgQjV?xw(laNRouPxjAGq8Hl2YAP68y5`rLr>$+f!;q~=(qMShxOg3Iol!s!m
zXx`o3B?d6Y@b>lw05~`}!2bUJr=FUrBK3NGZ)s_%l}@M2_xJa>y}iZt^>sY(=;#Qm
ztE)IXJjCAKUd%U}O*9$}TwY#ccXv1DN2Af~oosAuP_<g6YPCweUXRAn>-FN;I3liE
zt<vJ+BFz-3R4Qay7CDYX)8IG`S(cUHEX#_mQmN2Hxu(6gq9|f(YYPDI@bD1FOw;`E
zg$95y3@0z+d-%Seu=g?BwiCk9Mr_-jI%g_WRV7W+VjD-qb-UdJ-|cqen5wF?dy>!R
zN!N9fWtn7Irt|ajc%g`sWtlpi4iOP`I-Qu)b)EA0{A>}!Fn-qSby5_CGMUVWc6N3a
z`--Aay<R87Fn&%vEAO$nx%qWvWu=u)r^|o)&kus&*VWb4?&<025ByX34d2ieK$kaI
QS^xk507*qoM6N<$f<Gp(+W-In

diff --git a/core/res/res/drawable/stat_sys_data_inandout_evdo.png b/core/res/res/drawable/stat_sys_data_inandout_evdo.png
deleted file mode 100644
index 7aa6f00f2ddea2e57b7b6077ac74a851e287b998..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;zI)RRC3Z#<Ju9000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2>}=Yr}0q$00TftL_t(Y$K6#uOCwtte&#zfN5%;lOpp)|(>cX9K}fL(q8BVgWFn?g
z@DJSP{sfEr1FXaa8wV{c-7X{$0&8&_A(f4+dclYWk{IVB?=AMuAzzx^b{}||!}H8}
zzs`GRfZqi|w8-c4pC2C||L*mAxnFf6isH9KBJo$XS}l*$<!E79mYYZ<lJR&Pk|d$q
z?Ltu$D2l>gZnxWDjDd*I>-8W>5`5ps^Ye4g_k9;Y>cdKii28+%jSWbW1VIqM7{kfQ
z3D*jR0y>=zf*^n>iby7t=ytm}Jv|jZtONjdcX#ph^aNR!p=lbzFoY<I=ytn2u&Sy!
zKR-vIPyhg&ot*&yc6N3q_m%qKI1UjJZEtTA5z*@ED(53DdKQaCDi(`0+=+K9iL#5}
zy6%sj3O~9Kh9QQ1Jv=;MW@hH+CWMBtyu8da-rCxt;YuCHq4o83&gJuYnmEEMD=Va`
z>bUWQAP68LgkgxOsVVrr58wCE>2zS4CS+O0{rx>&US1H3#n5av|Isw<&w9OH9%z^E
z`v3q*k^lgPVW89LKoA6Yo`+a020;+;`uYk0&~+WHRtt?r1G=t*F$TsM6h(oiX`ejL
z<0H+3c%FxNJPt)s;CUXxFy!YkJ3GrKEDS@m+ikR3Ed)Wp_xAhw|86Bm4n7D1G@DJH
zX+Ii`1_1Dj8C4x2N~j-E0stUJ3&z-;WmyQr5N~g9W9{JJ0IgQ*U47U_DzR;Qe_>(a
zi!95@+uK{*+}xmEuk#m=j*hUjw1mUML+tPGbN=}F7`a>yS65fq+uQrFx)H3ctx-0c
zrEE4!wOVapgln}L*ZL80*=&~P=jUl+kaRjtnM{VN)hdlcwOXZ2CNscgG8t~^behKA
z_<s1l4^b51I1T{d?(U9jb8~a=?upRr^+peV7@p@1*s$ih?m*xu5!ZFc?imZyG--Nz
znp;02u2QKC@Rdr1Yo=*VJ`-Kn$+9dm41)~ApmMp)9YvgB7*r~ih={0EDsj%TEYfv-
za*$Li_1(5@VvLchsvp|r<t1M;#>lp9N~KcYM?R3l*xcOwV{viui!95@U;XC?LGbVO
i_4VGx#l=_rR`?G-qhuqQeUT{u0000<MNUMnLSTYu7qsI5

diff --git a/core/res/res/drawable/stat_sys_data_out_1x.png b/core/res/res/drawable/stat_sys_data_out_1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..54187912f6b80df41f80a12140b699c0b0879b52
GIT binary patch
literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!)=5M`RCwCFR!vB1Q4k(~Qd6iz1vQiw
zK~cF(T?h|?z_q9ZLhwM`1g)Y)TNi>txM~%>Xb~>Lg)6sNL_Jr6KdXx52@fQ)U0QnI
znSpz`SH1T=AJo8b=I6})&Y3eas^T~fKATiu3K9qezO~!!^k6XXPWlnGTK&^zv+ZAB
zUtf;%Yk6UAZZ5|*+RbJ&OifMwGr;@%JG{KSc-fj`szVWEW@g52Fc|Puu(`Pj;c%Gj
z7Z(>$EEbh+0eG;tw>P`&9$vt-u~fmw#|QNLePIKFp-qV~PU&sc;%oC<C=?(Ti%C)v
zjYi@0^b}k!7wNd7j&?q7B9P%Al<)5DNKPh`;C8!dMMC>TAiZ8s!aSi|sZ?NZZ;$j;
zDn;wT!2#LP|NQ(c3!)W+s8lN13PQsCiwSk!hwrkovch#b9V%&7Nc;7A{c@t4EG;cT
zHk&1VXJ?1jbUICT^qWj3n4h1A<>h5?I-TC>>FL}^x`qLUL3}<R$%#Y)s?{p3NN5+w
zU}a(}=yW>!NXL7<UJji~4>$>7D$C`vN^%o+-ImpArIU2K-Lag>WMqBgc;w+d9#4F6
zaq)*%tF<?qO}M|mheo3zY&<?b2EX4AM@L5xkH-c3>gp=Y&d$Q?>nqf1HNh@!XxS+o
z3<kM}hX<0+&dvycr`y|G*xueId24G6j7B5LCnqNo5Oz>$x`v6BA3Y>?wHN>ib+n^j
zuh-KDSv5%tK>W5^rRj>pFA|B6-fFc3AC~HHS}<MW4`bi_6$DR%AacI-^>wgVERx)B
zY-~{Hv#OGSsFg}^+#KU?d2@3^{h-lkuqVLbaKOUC0@=|oo(^iIbm5rcK}w|(*{`my
z1l#%fIXpf-0+#;M(-RyX9!las{5vv^*~xyfvgTO-aO|Xtyt}(A$haTlFrNRGYzc=#
yq2Suu8uiV8bo*~MdcNoL`Qq3ATlq}-BftRYia(fi<)Cx`0000<MNUMnLSTZiHiYW{

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable/stat_sys_data_out_1xrtt.png b/core/res/res/drawable/stat_sys_data_out_1xrtt.png
deleted file mode 100644
index 74fd351e564c558a76070ea4423341deaea82a05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?!D~u%iY500S;bL_t(Y$K6#iODkCv{^n+8oN;t8I046L#3~Vk5QqdV9>@c?v9K5w
z3t|62%5C3nyM=|FjT<aP#v<)&S21LtmJ+*&5J8DSL@;viow-{qbIGX5^KJPKTsS%B
zp7Z6L`<*ku&mu~!EG{m7YPZ{eMo~2Xqe%!M-!hrZZ>OiHf4}EfV`Xe?>@btbOr+Ck
zXqxusBIg{>&(E-JTk49Uz%UFvJUq-Z#ts3v13_%to*;x^Z*NaJ*VotKI1bwFHUL1=
zG<3UNyu7>s0A^-p&}cMZ+cp?u6MZX<6(IyDrP$ouM6WFd0Dv$IB>*7=mzS6Fo)7}x
z1!0VV5CYEmn@d3uAP55Jx-Ru7iezHWIT&Lf1Bs$2$qMB^UaYOH0RZ;*_vP==(b2?v
z4FXYnLE@yn?IMJ{0T)8x>FFua#!jd6u}b388%zj!H?S9&Qi>>wkjv$S>$<}8ynk}J
z+@}PH@B3eD+lFbH7#SIn!KqXVoO1+0kZ9Y{(GfIFgQ}{~bsdZ`Se6CP^N`JEF*!Lo
zZ<^*|Vi<kj|H3){oe%;|(-4N?|DNu<yE_OWz!*clURM$mUn~}dVHnVL9jdDKrDV6;
zmF*oQoO7I?pDT%nw=C->olbkLR_k3F1HjJC4$9^7hbrpLk&2a-m6b-JQ21OZ6h<7!
zk)?-Wh%gMXySs~pg$2yb&7oSYN_#e&#q{(vEX%^}?X9$P&T)T#|3{)-uVs08Su~qX
zIUl7`N&4#bI<~g9000{s8yFrQ27ts$3d0c1W>ZN}__Z_|4Nyu^sZ<gG08lEGP^nZv
zDaFvx5W+BoX_}yv%G3L1YCn*8&G^0#0Jyoikv`A!68{(g9v>eQiF@a$F9@Zy?;ui2
zQ7jfQK0cnH`_j@9I-L&A&dw4bWDq;v+X8WwwOS2^VIY-CLDzM-u8XOuDb#8;Fvb$>
zB7@qcD2fC*K0XEjoSd9U+rhyBuCA`&I1a9_ud%(oorwFcxUSpE=kvm{ETQZAz*8=l
zrEXc4$mjFIb=}sRZ~SXnU0wZUc6RnJRaGZ`bhU8KZ!az`eyvukU-47PzuWh`)~e@~
QrT_o{07*qoM6N<$f{?YS?EnA(

diff --git a/core/res/res/drawable/stat_sys_data_out_evdo.png b/core/res/res/drawable/stat_sys_data_out_evdo.png
deleted file mode 100644
index 21e19a713f936abaf0ca8c9f2949e53382106044..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 963
zcmV;!13dhRP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOV;
z2?Ydj%4iw@00TowL_t(Y$K6!VOXFG;{*tz7(r9UE3k`0>l?#hdP>L=dh~R7#TqIOP
zVg7+GXFuB!+`Dm#f(+So`?jN4WZa7GDnbQI>W^wkOm33<7LQz#Rx2~h`QVas&$;J*
z=bn7`0)Gp*z*t;d{KqhiZ@%x(|L!I{&;KeE3SUl7Pk+7@j|WC3llf676pGnw7KucH
zEwC&Lk|e#kx$pZhO%t!Luk*HT{{WzjJPD<gh69_Mn;?WBnM}gAZRonrVw$D_0Fuch
zQmGUkA0NSS9CTghMxG>`9ENS%LvdZ#p=lay+s5JH;k&u4o#BbD>#X9z?^_7SG))`1
zZsbWuCH@iU05&!@D5aFDs!F%EwjwcARjI0~v|6n)-`d(5{ZPWo%ga;{1OPxHkzfkr
zI1ZUi1`iJp7#kadX_}yvg5&;AjmP6~T^F5B2Zmwb>FEhP&;LrN(_gNxu6{<^MF@c?
zib$u^AcU|g#>dBDnkIbTXa0Zy00cn*Aq2Tx4uT+{SS+I7@6UUl$0W^29LE9A^N=Jd
zLh|zR!YU5?1DK`>0O<94a9tMwAc`UgA;qB|@47B}y&k&VE@H7*<N`iFKLY?#sT2qy
zj4Yi_!?G;ai7*1f2#GAqx7loVqTO!8vMlub{h_LNc6Ly!)!5uHjCX|;CW!^c>gwuc
zxm;c@m&;@Md>#PM>2%<E9z4&(-rgP-78Wo&JBvo6!Ti(H)0mo?f-K9pySrn4*LBhD
zcE3i{HHej!720aG000LE2dGpkEOvHwhVAWb06?``MJkm70POGYvo)UQq19?}LpMH*
z%gakRj)Qu=9w7jLN~MB&y$;85kW41wc^)K5g5x-Bg#S_eJrY6)c%Fx<ssMo7+glc!
zn3#xE9H=Y2vG4mIlLV4}FE%$fhg>elNC04IX$klD_c%X4kC5=A)Dg&aP@aSkG@DI`
zqKH^520;*@C<-PgC(&#+K?sSciyzf4j^h}~@$oSL;N;|l`Hqf`aD9D^d_Iqxn;Y!z
z?nd%HgrX?zQmI5`S*C&@j2yLEjoGp+(^9EK6-8+eJ&=P~Utj+;Gc)r&9*-A)_eFPI
l_wM52;&Y?X_!oZ_{sR~K)_~1wGLirQ002ovPDHLkV1hpWuJ8Z=

diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java
index 65b2ddb4075ce..10680dd99cf0f 100644
--- a/services/java/com/android/server/status/StatusBarPolicy.java
+++ b/services/java/com/android/server/status/StatusBarPolicy.java
@@ -253,19 +253,12 @@ public class StatusBarPolicy {
     };
 
     //CDMA
-    private static final int[] sDataNetType_evdo = new int[] {
-        com.android.internal.R.drawable.stat_sys_data_connected_evdo,
-        com.android.internal.R.drawable.stat_sys_data_in_evdo,
-        com.android.internal.R.drawable.stat_sys_data_out_evdo,
-        com.android.internal.R.drawable.stat_sys_data_inandout_evdo,
-        com.android.internal.R.drawable.stat_sys_data_dormant_evdo,
-    };
-    private static final int[] sDataNetType_1xrtt = new int[] {
-        com.android.internal.R.drawable.stat_sys_data_connected_1xrtt,
-        com.android.internal.R.drawable.stat_sys_data_in_1xrtt,
-        com.android.internal.R.drawable.stat_sys_data_out_1xrtt,
-        com.android.internal.R.drawable.stat_sys_data_inandout_1xrtt,
-        com.android.internal.R.drawable.stat_sys_data_dormant_1xrtt,
+    // Use 3G icons for EVDO data and 1x icons for 1XRTT data
+    private static final int[] sDataNetType_1x = new int[] {
+        com.android.internal.R.drawable.stat_sys_data_connected_1x,
+        com.android.internal.R.drawable.stat_sys_data_in_1x,
+        com.android.internal.R.drawable.stat_sys_data_out_1x,
+        com.android.internal.R.drawable.stat_sys_data_inandout_1x,
     };
 
     // Assume it's all good unless we hear otherwise.  We don't always seem
@@ -971,14 +964,14 @@ public class StatusBarPolicy {
             break;
         case TelephonyManager.NETWORK_TYPE_CDMA:
             // display 1xRTT for IS95A/B
-            mDataIconList = this.sDataNetType_1xrtt;
+            mDataIconList = this.sDataNetType_1x;
             break;
         case TelephonyManager.NETWORK_TYPE_1xRTT:
-            mDataIconList = this.sDataNetType_1xrtt;
+            mDataIconList = this.sDataNetType_1x;
             break;
         case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
         case TelephonyManager.NETWORK_TYPE_EVDO_A:
-            mDataIconList = sDataNetType_evdo;
+            mDataIconList = sDataNetType_3g;
             break;
         default:
             mDataIconList = sDataNetType_g;
@@ -1031,8 +1024,6 @@ public class StatusBarPolicy {
                         iconId = mDataIconList[3];
                         break;
                     case TelephonyManager.DATA_ACTIVITY_DORMANT:
-                        iconId = mDataIconList[4];
-                        break;
                     default:
                         iconId = mDataIconList[0];
                         break;