From f4b5ab193c95675c07b8e361846d21d79571da0e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 24 Sep 2012 16:47:46 -0700
Subject: [PATCH] Fixing various QS issues. (Bug 7216908, Bug 7217154)

- Making distinction between wifi not connected and unavailable
- Removing periods from carrier names
- Updating airplane mode icons

Change-Id: I8a629f07375faaa34a1b5ebeb307605f12f75173
---
 .../res/drawable-hdpi/ic_qs_airplane_off.png  | Bin 1678 -> 1883 bytes
 .../res/drawable-hdpi/ic_qs_airplane_on.png   | Bin 1688 -> 1888 bytes
 .../res/drawable-mdpi/ic_qs_airplane_off.png  | Bin 1184 -> 1250 bytes
 .../res/drawable-mdpi/ic_qs_airplane_on.png   | Bin 1187 -> 1259 bytes
 .../res/drawable-xhdpi/ic_qs_airplane_off.png | Bin 2285 -> 2683 bytes
 .../res/drawable-xhdpi/ic_qs_airplane_on.png  | Bin 2299 -> 2682 bytes
 packages/SystemUI/res/values/strings.xml      |  12 +++++---
 .../statusbar/phone/QuickSettings.java        |   1 +
 .../phone/QuickSettingsContainerView.java     |   2 +-
 .../statusbar/phone/QuickSettingsModel.java   |  29 +++++++++++++-----
 10 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png
index 8a6475548e6968b82fa5b4f709b1f8610a41638f..ab66137680ce676cfaa50574465698d62635accf 100644
GIT binary patch
delta 1769
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
LNkvXXu0mjfh)P|K

delta 1550
zcmV+p2J!jZ4vr0wNg*Zx0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}olY8-z6
zNB{r;NB~C3Yd!z~1zt%+K~!ko)tXy~97Pm{zqzbQFi|94aJ>bM5-%$TTjG<~C?pV6
z#P|>miuXrBBYDu5JQx(g`xP_~B0hPG(FlS_^g+{!D~TYYs3;;a1fuJjb+>1HIOj~C
zsdV>DdV1NhV5q*;sq>$|>YP(mQ=@;v6321)XaO(^`~)QSFp8qe`m9$8KozSw*{=iN
z1CQymS`N_Cr8c;Tw5VcDU<SAscmc6|16U1w2sEN7O3L;TmP#2=gUsmlEn3_Cdac`4
zGB6te0G0w5>-C7%R{_TWEh=Pwwg4;#<_F5204xi>8(IKoYHa|lK5J+J1mk~tk=E^?
zUO2P>f-)~h(N@(R%@%-0aBo1ShaG?om64qHGyMvhD*(OZ8i01cg60Z9$bb!@{|y6;
zoaaLiz=lRM=l#%6Vk<U;YC+ve;;PDr1_ltvu~#Nbo}aM)hHd8*fK#A`jQbhAKFNLN
zgV|B8-%8d7r9yhpsVS2HOMrjpfmMj*O}<_K2HXR@?~K=p&Sh3=N6bK=d_$E>fZKsx
z8OnP@jRISNCrPu_CIhh1Hv<J$KMi;eSfh%!$akau{Wx$3u-h5ph}r0ifdZ?qQw7%O
zeY-$;Gguv&D;EKu0r#uoUBLTgqmY3DtDg)!1>Dq!)$>Zr$=!ymp?`l>IW3jjlZjja
z8CEx;Yk{W`Pm?&SmMO+$6WFI9-VTgK5s<?G6j=RuWb&=+VfDnd3oYL6qs@!JgTO>T
zY;<)}VD%f+>Zj&d-2i1N9+o^H{`p>Hf`3Vm3Eoj6BPb=nalmW9Tfix#dpzEUC$3E!
z+05D$C<gEj@Ugb_j=+EGQrBk}06Tz(ve@>9u4gE3l&(hn`fVKUVM4_xfmeY`fLno2
zGXQ)9TmxJWeBxMcJNYKh6y6MMM*^f7uPbKM9VImtaxCyN;u+2etR5=9A9x%XQ_8<q
z#eCXqMw!xj8?r}qCGeh;Z-#3-Hf9v`PT*!TCbcn8*M?^UUjTo11y)Z;w?-Pk&%j3D
zd|(6cV=%P-c9u5)6OQ$ovUDAADewl8=!HO<dc7EU6L?micQZiuhSWKV+(3DY>;>*t
zi*Hs2jMl_iXetB1WT2b@-i>&+<-kh{-pi~xS!;o#z1%$iZ7Hw``W(0sh=5lzItjN+
zrZS#Q2KS!TI`Drj5(mbRVR^vyVX_Vqtm^Ur7<F5LtAWc9Pc$9S+yWVoIwlSHA;*Tz
zEd$VY-$R;4_~E$$8J>?I8EoDzM`!70G|$(13-Ao^m3wb<Au**3%AtUPL|N-9CPT-w
zPc7<5WZtBDtOp)I4ote@Ow)A$GTSc%_Bdf(<Gar+F&uwFiGs>3J%AiUg6J0Da)Ry3
zyhvPXu@T3y4VQ(;vC?9FHHmEO{tnclC~EhR<8N(_WadT9DiqHs3Gh$BePIb0u|U@W
zV){l=RNXGI3N;26ATHOo+4ms~OxQP79rRVQt&&0cG~JW-F9P>h)waq&3>2i^V@Tq5
zqP{zTxZ;0rNL_Sa3zk^}5F~&$$!frTz@x}{SlfNGAGi~EmjTwm0|O|q`ch<Ze=TWX
z3b$2Ia1WCvaRVKI4>AWV#3x98v{RM$IlfOb?Awh<iabiX5-VNGHa2gw1o!|+!WJO`
z%#uHg-gWnV3&}cHD&Un2c<fpRfMu!6kR)#v=>mUb9%*#{16jEIK$?AyAlr*Agn{kI
z!l~DGOm1nGXycDkNA)@Zz5`<S+XMWmpw0zWAcx;86ntI#KM!HC6boelm}mI~cmi2?
z??ST3j<0tUataua<9J-}>%i$q{(l8&!dU7AbKppv;g!s@_<YB&bu0bb&3}g);}`y4
z4O^4#1|1YIR53U@FfckWHZ3qWIxsM?1V_-59tRyoFjO%(IxsLgFg7hPH##sdz*+xn
z0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy07*qoM6N<$f<%Y3
Aa{vGU

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_on.png
index b2be1152d9cc0dcb65b95a3e2eb66b6eeb81fd41..e058bcdef9dbe5e5effbd4f29387cb65b135deb4 100644
GIT binary patch
delta 1811
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
BZ503j

delta 1610
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
B%>n=b

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png
index b8dbdb093a78bf77edef03380c5b02a76c8b5819..2d0c4790eba1be1f87d886d9ff1fd1d4bbc0d053 100644
GIT binary patch
delta 1129
zcmV-v1eW`t3E~NmNg*Ww0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&Tg|Y8-zH
z6951U69E94oEQKA1J_AJK~z}7z1PW$9aR(t@ZTFE5hH>_#Ly8HT^O7x95;&Kw2>g{
zLKnIc96%98ZJZiW6hT2z^bc?VC!)a#F>V54p%N2=L}@`6nLtoX(x%^gF6!Lw`>Ly6
zP_!=;x2o>&edjyFt?F2YR+eS{*uj4&e^^f74u<GPue(g(-LN`=j}83a;JpAo9@E&2
zN0KW4xeGGzP8c}AEqEL!#@H-Q$6UXKv5+iXilX?p;1A--c>fm;!#kKmuTxu;f+TNg
zvn8Z*VlCj)cp~;3qL00}5I>>YuYnD*J|=F#FW84cQ4~!e%Ca0I6k`KCjG2G9PsYKc
z0p7!)pDh~UUOXG`e#fuafh}cOZpHR^_gidSS1K9t6duUHM*;W@Udj~GDa$hDWb#$A
zC}*A8e(b~#_zv5G)NDu#FW`<0Tma65^$RsXNSz)&jRos*Zszy-nA5}II61DXvcTFC
zWO}$f=6AB|zEC#RgN686urPn~@5%_08*z=r)Dc!Cb;e?$7DstN-yN!?dN7t%c@}iD
z07~uXu=ILdhNEg^(wbD|@_mN56EC-c=Yi7{;rXU;S}1Y@3RONgwLt(rtqR0`rreTx
zvZN9=93UxZlJEKvBUj^gRf)~rk_bGHd*Xi31l~ws0-3IHkn^z-$7X+^Ie{;5X>w6p
zC7pN}6-AM=9%cXqK4<{Xjaq|MHFf?Oftm_Q%2V+sj<XnuAL2lbz)6@ol+sOEu%zB+
z;A`;_)~V`4ACIXD*w;A2cp6@zsxLiJ&g-q8OWfk~PJm5??CXNe5VzsgnE!5#Ko4gH
zflgZtbjq?!R$qc6u@!&2RTVCctyTqG5diyfGv31r98_h-R{@;Vc@cL_R3HG(!^b!R
zyYMr<4>I54p#UG@4_t@OV*PyV^$otn#hLrgiGHA^rPFY`>M)vC<@IV@kj+aOut#-P
zY_5T)`?rHYYA1wIf2w^AFZelRIiRZ77vZ&Ra`JUI+;U}r_cDL*oZ$Q6o)z)DR&{XE
zk_p{fn$6-ST#Fwq*6?Kgwgi~`8GRzT1Dj&bysBKUNd#&^UJ-~sS=$ZJ4IyQjxoHZ=
zq=jW!)=O)$@U5CEXQ%O|AnZ0&yFo~}7x!lytqPyEZI<S3jJ4^oN-h{pQlMUT4~7z-
z<CV-sjg>9drO$t^UHBv$J~R5pOjuHi8*2ZIDmLJhM4-u<ti2KaK0Mck)%r3?78dPP
zec`5edEe%SO{##sRrL?hl?86zS`Ueug)3G0zd_`5Q52&IYdWf0vb#>WPNM!_(AMVg
zdbYvn5c5Z>SQz^PZc^ZH#mZP@n{R$z0000bbVXQnWMPvR1QQfAR53R?F*rIgH!UzX
vIxsN$!Ag9SJ_H>gG*mG+Ix#ppF*hwRH##sdi=6Vn00000NkvXXu0mjf&MOSA

delta 1102
zcmV-U1hM<#37`p(Ng*Zx0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}olY8-z6
zNB{r;NB~C3Yd!z~18_-1K~z}7#n(%STtyTH;O}<#j3g-dz!!o@z$YlE9ee}@pJ-N+
zfD1(uaHR`HUFlv|Vo=eIE)+yik+>1X(UpUUUPTlHABYQADu@KlWM+EW#XZNazUg#N
zIwlres_(6;bN=(6S9N8MQP*{aAufNzcD#l`uJ`->P0Q*XgYpV5<2o$jC3H(5n;D%s
z2*@)xhjMrz=0N~Et^iWO4KZ)v5^QU&|Mvjux-MTYF09^y^N%}#7{i#iw7xIQA!{xG
zIl8U)wG#y(8ORJu%GdvI22L1&WFUQ>3>;PdA2om?1M*B&%)^3#VO`hljG2EQKucIJ
zEbZWwVp~<n>L$3&fS3xPWpyvCJP+^SDkFEmE4W&d4c(MI3&g~t(K^)CRJ$SW!#<p0
z)DIND*YE_ME?Ak`q^c>(JMpaJY`lQo1(<dgq@pf9!2S58aNBSah-!l36fz8DcjI}S
z6<|uY<?oF`-XN6zjtB8p?8|?(F*e$MN?#9x=GXBC&J5*Mv9ArJ6F`#o)A6RJO>ZrL
zjRj~mA-y(m7hc4<p*Sh8;;C`as3ZOm^MwU-WySm+d+=#1rgVaeDn6d7iRS${2ZsXK
zLd>7z9?dQ2y@G)yT!csPQz%JmS7YsCO@I!|c<9u1-H8v^<Lf}W8i0RJ3I*@uR$Lpj
zGG2NQ#rzyD$6kCBKo$!YpTvjZQgvNdr7w4Da(p!otwju6gFEq2Sd=CB?*hPqm=~~u
zS2cBFSJ2*zwN>0?bd%~%Dnth~QGW&Q#TNlGeV3N66lea5IioxSd4Di_dsv>So2`48
z^uup>7MJ27{Ag6sHXMK6Yz|HUz<6KCI9S4M*rBNr|K1(SI#Awd%Q_$fCiZ1X-i5bg
zd2i6(>-YQXv9APM${VW*y<%hL>6o=;<%+$@SQ&&X<(_`OUji;&lRyS3yJ{btG+Ndy
zYJ%yO@GI=pq~$`=+m>~trZn>gTO6#yf~<)9@Nld>gU3uMxkrB*n{CJ0+17C-J`3f8
zcpk;On({qxc%zyRKv5;L-9C;_(AUIDw_s&w0NY`7X*o6k#s9$5u#BfPF(8zDhhH_p
zJH!RCZ%+Ym>X`NCGy!bW)Q2T}sp$z{;b)wzDZkq_H=;Xmqb4n9#@H+XSqHui>;7oD
z2mZuzUDwO;zBPXyHgQ$|2iIC4i_bx@-~a#sC3HntbYx+4WjbSWWnpw>05UK!GA%GU
zEiy1vF*rIfFgh?cEigAaFfg$MN6-KO03~!qSaf7zbY(hiZ)9m^c>ppnF)}SMIW00U
zR53U@FfckWHZ3qWIxsN6S^sPR000?uMObuGZ)S9NVR9m606}DLVr3vnZDD6+Qe|Oe
Ud2z{QJOBUy07*qoM6N<$f|iWx)&Kwi

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_on.png
index a20f6b2de8e36c81b9fc6bb2ae9c4374b975ee57..6a2906ea192c70a05664cd99d635d76436274657 100644
GIT binary patch
delta 1131
zcmV-x1eE)u3F`@vNg*Ww0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&Tg|Y8-zH
z6951U69E94oEQKA1K>$SK~z}7z1PW$9aR(t@ZTFE5hH>_#B@hgbYXCQjpIfUoO&Ta
z)P-5-N^k&06t!_`L{S6<MbSUN0i1|FoDkzCAlfQ1F-Vjav>_7+ib>k^d(TCk+kIbk
zRR=};LUF6=4&QgaGu*0%WoVu5O#Xk^z#xBEPT&UmXhyHOOyJG1I)M)j{NLcM06rcQ
z*o=phD*w3)GVn$i*u%|u3@66eG)~8CyN0olEM2C?NB%AN19&3d|AoWwHfGUkloq8R
z$y?fN5viP54fq5ek3IWnV=pemPiVGFV12BQiCgds_Mta5K2imu)14V26k~rqJcP-(
zPsYI`0p3Edoh=&R9y}B8e#fuafi0cx%vNlVcfZBPWu=l4PvZUzd=P+7<HbxNjZSwa
z<z(_zvM6Vr+J5ZB5BLt-g4A?K3(w>B3|s(ChV}C`KuDb)K8XeEac<`KxtP<!;W#<2
ztFpk_6J%PrJmxpD>)uc{)q{We_?fpb^Y6+Ck{fZ2h13yNC3S{kp%h1XK;IRrq<S!v
zRe2UPvj9r%=&<y9T!y1cWYU^c<??;{xC1ZMf#-o!72)}&a9SvG1I85jT-AC3_>>|L
z+nI8U>dB%?SaE=)ph>=KM~qyJ+Y}`>cS|Dh9PW<$UKMyHfhEW^4TFE2k1meQKyw10
z<I?1!x=Om_VKg;9lC$n-0AqN+0z5Zr4OW%Z`DX-5DkLdS#Tz)zLLh#C10@0{Vf0W+
zS7pJXdY^%>#fMm@s1I#CswiMz;|#-Tc!i?Av_v^Cw{|XZjn5kaHX5?83o?D&idSO(
zJ0$`woD~EbburNBbZ38()tBH%Y{hOxg-c_r6#+LE0Q<24?_vcGDl+5C08Z+>fIF8|
zAOOz8M>qnz@H4&-GT-9C03YBFT!&9%{aozz4Zgs|nfuO(zNe<8({Q`uFq%;0^=e#@
z%}W`uM{!ncE`g`}w}L=wCxlUdDt!&l`#EGeps3du;ni$%@^ybR+;U}rw=(dY;Ctbo
z74f`Qad1(S3C&WPP2(n9iytl2@MQhA1ep98eImI7n_|wKqFk>@1WG|(5Qsim+YHc+
zA>~(@n?`X=TG;8%luK)}@XeAcXQ%P1AZ%7tyIx4R7x!fwtqPykZI<SBV{JODk_!e)
zDNruE2SbU^@N$3VqRPq^>(Xb}E_|E~pBa5+CM+t&6}5j-5gTwyB2Z;b)?SZ(AD*ql
zs(qOx3yXFtzHrmKysvY^CPl#BqWA}B$^tiUwTDE>!j+2r-zai=YJ6m{#F~bpmh3JQ
zE|Vz#7u2;`yq0Y+IK=#cA{K_efU6Yv8{8vWDQ5yQ?f{b!1RE7HG*mG+Ix#ppF*YqQ
xH##sdT(&{TlR*R=Au=>nF*iCfI65&lEigAaFfc9a`E&pP002ovPDHLkV1iJQ1ML6+

delta 1058
zcmV+-1l{}V38M*+Ng*Zx0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}olY8-z6
zNB{r;NB~C3Yd!z~19M44K~z}7#n(+}TvZeY@ZX!6L|PR5z%K$K1+5ASI<}xi!B4c=
zhyg)FTIfm_in`LhuEe6E8(k=f;0M&rpftKNh*~0|AXG(MI2#p2irOZbjEi?JIrBPA
z(y6T%9(Ufm=ic)_|MPXHGQsHf`W1hMxCT4$76xT~adu|YXLU|Nd4<<;6Q=PR+8M}Z
zMr#5B%AVUpIXn{cAb_1#07bzqF|Xn(Y-_Cl_W-)RetzAatlomlPCI}Y!<e@;zE4eX
z)<gixXgA)M&lG^dK*^v&`O5#zz!?Kj7$`n344hQ{pEQ7!0cB5>=3!!B*zJGyn;A1X
zfW~2+u(XA9l310_Y8P;u0kJNChSi<0at0sZ25atsH_%mQL%W>45s0xxqp_*2u69E_
zjQzO4T0f9}FXI_JpIBM9Nmc78Z^g5Mi}4EP5}0Nd6h&<u#6J9z+%_Bsq8g*P95M`L
z58!276kxL3%J0>5-XN6zjz@p-UdWZT5jL8BD!v{B&2Qr!To}r$B-aGe3Lu5{^YN~_
zO>a%WMgp`NlU}R153l0VP+Tal;yHvR?20`<#C%0!E?3O&u?L?wVoEEhsN&<f>S#WI
zOK>cJO~w2L9>h+3m>8JHm3RU_g_2_JQmlQd4$xtahgP@OZ^eh3@lAgqT?#;Fg@TW8
zXUM!C-*V|a7V}HE7JKn+0GUoKK8ugTrMkU-m3=v<&he$#v>Y+86Zhhiu&6YlzY~BX
zF;C$r-c;9#`-ApQtS#X-Yd5L(xI%P99rf4YA$%1ei|>l%|D-*C#ayDi1oDAk?e4I=
zq;6^5!$Lp&h8J-)9>af+)+*Yn<D1Pm0F3s95(o3ROC7Wa6M&IAkZ-iP4k!T=a-}5C
zrFhsIw09O~XI4TkgU#oS)PznFEO|O&ZLVA)TNukhcr?o_&dy}O*);{opqyPbH;x+(
zYo^t~bVv9VcB|8Js?gg!>qJdy!y9bcScL_pBJRiIvGxL<vQB@=J<-@~J1(7V1=r)t
zP(Fy~N%Yj^d*Jv+H5q_ZB}=<~8lT}tb*!`#E4u^OE^C*TQv;Cx2cCxoJg1HUq2w@r
zRR`}7mxtV*1aRH4(Vx=-V4J!=%&QC2A$*OWakjer?oi)|?!m3<wA?VpHUd!Uz;|KY
z9}V}wpIGSj`U?^9zBL{;aaI2pg+Uh^6Vpr)lYImn6)`kaF*Q0dHaajeEigAaFfd76
zyE&7t1RO>&G*mG)Ix#jnFfuJLH##sdH~|BN0000PbVXQnQ*UN;cVTj606}DLVr3vn
cZDD6+Qe|Oed2z{QJOBUy07*qoM6N<$f|Up49{>OV

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png
index f47a193999d6ce84d35acbd50131cc03c418411e..9a4239bdebac6bd2a42725d2bddc0522cf695ae8 100644
GIT binary patch
delta 2564
zcmV+f3j6i#5&IO7Ng*Ww0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&Tg|Y8-zH
z6951U69E94oEQKA32;e7K~#9!?VD?iT~!swfA`KzJ1rKcAjK9cLZAc?jp3xJ#z!M4
z8c`Dy6I385(TJ!RjUZyh`bI?R12OPH6VaFoIwbl*5(%&1qgSP^NU>U}V{1j*;ng~2
zX72IBT5Ha_`|NY(+;i{rp{(TQPVav?XYc+0ueH}}pTe{9to&a~<6tjfuB6p!<*+76
zlD1kck|de=v3al;Iv1ezJ5+AkYPA|6IsX#`ctGy&6c|#BL%^{9)**-e76?qe3AFX^
zrNBzy1mG-SD{wt90i?DK1`jrXK1&-I0L}w00$vI%SDaJ8Lf{i2V~3?U%{PA>j+X&9
z0^bJS3Y@6mr}g`MV4ff6u(W`{*`@lq4AJf~y{%2Q#Rv3zBVq}MF9Ct(K^)vAz~_PI
zI^bp%=J@sjqwabN6}CXD)r!T`Ljk;L{tDo04t$eN=WYaS1nvySEVO_iVQ98mt&|{)
z_=MsBg9liEnEjQA6{N%!YGi-i0sJE%Cmse%G~NgXg-C4eCo#cV{Jd8oW^cd6u$V=R
z0v7{M+L{Z)V8qM@ff3*-V1ER3Blu38bLuA{7USn3&hCne;CBHx08h}FC*%o;fS<3-
zT>$(6*bQs~b^w1-Quanju?0s7sX|P!1se|h$AFLP+S<g;-bk4Qz7Bsp;Kt~fchFB5
zfFA@d1=avZ0k6>OdzFC4fi1vJ;E%xHl$8GfdqSq&*fVo@VoJy`tvv_$6z~BBU$p1F
zMXXZ-rtG(Ho*C0|1%&0$mm{XO7)d0W;WJJQ^bX)rC1nF*G24NE>EAJljhDJ>Deyd9
z%Li34X~}a9B;CD5mG^&y8z)D=U}S(r!25u!$wJFOaF3s?fq3NO^s`d0PXOb<zm=37
z!0&)DU>oqX5;Ivqika*Z;ETY!DBtt;`xNjM#6eD!fsYXYvgfY>j?jNM1C4}EFGdPT
z^|e$#XX<ayAeOKfctlBg2(g$)l(0QW(vl*n>@|oF3dfIuA4h*o-in@5@G%0K!2Q5y
zftMpy)G{||N~h+%#)?Ss3!JBf0G#Zu@7Bd{N4)m0l&o`rw^1(U2*(jixq)oYr?Whp
z^8sE)fENL;1<nP|KpasBu$z)PW+_D)eMYYhmE7k;-DiOBP*L;51`RqXp1tM3D&SR!
zR!$-F3q@AZjf8(mRh25$!0!M)2i#1M=U2%;az4QNW^_8DG5y>QoDRHNKdY3S7-`**
zkxQm#8N-9W8u&h$5-Ni)oFLXvi~t-#Ea4pBO~7gT8}8m-Eh8p2=1vEGvJUt%hKoos
zFkxY|6i9&8z}dj5NE9$>(;p%X{G&)Mu%2N1benc}OF)0@Sx>~Ef=__gAd%!m;(0{3
zWEl9zkSg%D@P;}yM=gyMkTH{Mt1M75Rs*j`a)D(PhA)z7gvianE0M}Bn%~bk0TsxA
zyuWyfF8p;!cwIzy9Vv5sW564gh$hhPrP}O!TRbSLV*X+|k_4?mB1zT8tZjk)z(q-t
ztZ%hi%_M(G+7+LVO5eM}P8%trHCuR-OoQ8ybhxmo5)m`^`M^m*W3;x+NmJCDWY7yp
zfs>FP-W$lAV^vGEagObRxKf$ZbAd>YVHr|qoTuQ!dZ8+y<H*Y5Lz93A_yxcxfw$9{
zB>DShvjki3DM|tro;mOYM8FRtntwO>wAcK^Q%HYmTSZm?#~+deMB3MbNO$RSvR0N4
zmDa~!hje|W+_g~bxrM;dkvY4TzB<7O_!RgE@M-d`EQ{;=fSZ7?>a~Z-8YnTbF?va=
zW+Z9>bxwmK;2XgEk%Gm}=0os%kk-{2q{%uC+&#-wW*Mg=j?|w4_D+B=dW?wKVs1h5
z^B#Z1tdA@JzYRInxgKe%T1dQ&EX^(R@-HT9+trrbD<i?gxz|i)8%yuG6!-#?0{h;*
z5wQiS=I$Wx6BYwMM+&M~>)XcrGm=T}1Zro5%>wWvWP8?s>>hJm-rVik^MUIE@Rk)e
zfZrfnW0cM&hHq@%&g@}v5wN(|Qz!2PZ6SXvk;8{wNT+t2vb+m%Sd(;Gf(Q6cq$_&_
zdCfP0UnAD>d*Vftt>Iq8CyWr!7eKbw3Z$!CTN=TE$ZDjsx=OE4AkE3GNQ~ZsG$S^v
zrXE9j`yi?9O~^Yrp;<S8pCadZ4-=fxB}oz<%q#?c0KA2)491OT_pU`EOaph|*^Pe;
zx=DwS4zPirM!feh(jGqxcr)U#_9+pMtF{J^S5i(0G;fQ)2ly~@be03}NH9y;2mDeA
z2oFOVZrl|CDYXdjh01k0_$5f3^^V1-v<t`*k+a=`41n$F0pM2PqlmRc!57FVvK5af
zAL{Jy5oV7TrP6c@nNp3eMe_CaWF>!W!`*M-+GJ_0f%n>KA|dUn5PXs(QSkbkf!PW?
zNO?whELmk(D;EeujMd!tB35uEax5OUynKBhJK&fAzM*6MoyfU-i5P)xRYF-bcp-3_
z5?7A^uZbi{{K3T2z?Tuv{!PUD8{i_7v&H`cIn#TR3YssG`^jEwiA9T}faQPYK<m^5
zGZql(<QSuyfDZxh1?~zK5F-EuK2E+-T2+k5?PT5G>4JNYsWE<@fRG5a1~c^(_%84c
z;9BI!yKHZs2@IJ<b)$LzViwtUv?KbkfdaA(pk_@FErtRT+V0+eA|>m^NJ#Sw@v?+0
zPp@03*t~ZmZ=e)eot;S4iUfa^`T<IakMBQ2EWsq4e3;BTcP%a&G!bjNujKZVkvB-7
zUltHqjET2~9|Auiu9;!vM5xxHoY*$}9+?w1v2l+9j;tFADtCk&5k|sZ#0vJ1`3WOq
z9@6~<dTw2(NbRsGnBQbRnIr6a8+6qY3rJ`n#m%>fSB)<y_@5iy%w>PuU;_A22?k5w
z=aztg1OvBDiSSt>WL?`{Th~V5T}b29XPeXdeMZr{h<zu(i7jF`($CvZr?!^__th1%
zwg(YsXt{-j#tldf<H?#^0wP;s6nRm>JH+QBd$YC$1lwQ|dE47N;?2lW`37nhMg3@t
z+bgNp0)Hh-SdJ!hPQ8B~!W!rwBdPHK(pkDt!TVSF4h#W-6*PfA0be33UhYH+A?hy9
z&127xAun4#grw&i>8{YqNl)hju9IW?{8r@rAF^Vor+VFqS<zagbkBjW(-G>|$&mkV
zDVHHF@v(k^cUF)Bzg6%Zg;w3>XwL)$RU}BgV3lA$G#}38JJ1?Ef$yuh!;?nrzo_<e
zo_>z|UlFuV0U#4-oReAz9TYTFF*iCfI65&mEigAaFfjVTN_>-x2pu3aR53R?F*rIg
aH!UzXIxsMcobtc`0000<MNUMnLSTYSLcSFM

delta 2162
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

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_on.png
index ef8a7ebe722813024428325dc4585b93b7e20ce4..0af4f3d1b70a151784564c3a32b5ed0760763fca 100644
GIT binary patch
delta 2565
zcmV+g3i|c?5&9I6Ng*Ww0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&Tg|Y8-zH
z6951U69E94oEQKA32#Y6K~#9!?VD?iT~!swfA`KzJ1rKcAjS4l5dt-UXv~nN8Xt||
zD}$PtnBa?`L?ga18bQR0^^J(sCk8%fA{tXchs60Hi3E}OYDQ@*Qmj^Ly|tq4@aj12
z%-rLLwbq<<_u1#nx#!;LLs`kqo!)<Q&ffd~Uu&<|K82^`Dfz#a+R<LXLdo!0GlO+}
zq>&7dH5ngi%>7tD+6!F>(E1%JHyIvl)<SarCkXI>+}{Z>pcn^$LH(^wj{7YTn0g&(
z>EA1XwZQ4XFt8K25tsrJ+Xnqd8$gex1@r+I1D66X09Gr`8DJ^!v5>LjQk;M0YYxW?
zfo}lc0^R_eq2Oor`x0Q0ALqEVfWX-$`gt#+-Bo&9i*$?k>GxK|5{_R20?mUsxXXdh
z0#A3q%__|CO#-9tdIBZ3!0=cz7E_M}@TU2zfUh|4b=sY~5wI1wD;zV|0)m90K0MY;
z2*QX@D2_0AfF+38UyWEnLR^2LM%JCcKLT>%VX#2swO~+)#MWLC6RgG0dktdt_FD{#
zS;Q!C8SuERIX4VO%&Z?60-gX4ML^er@5DK$UJ_z4ei7pAt||$BA8-@!80~pNmVgNO
z#md}Ufj<EIfo(t&_=}QqFhYtgI7&zvVuCGLbKpM$d{o!gB5w9Z$~1rQRp6IyjJA3E
z{e%Jde&7mV18@@XV!eJ)33wFP0qh0-2>eY+`44a)WZI2AH-{&tfDF^x(|}I^?^E!3
zd)`~bCM96TehcTBGaXkzSPp$9Vrt8gM4}!(<HSHWfrpipEr`YJ2L7dg$0Rmh;;tpY
zGjuKQSH&a+&()B0_f~&Z-eYc@3<3R-0hR&p2CgLyEq%c~ezF?kksJD1tJkN13E<yK
zN)z}Uum{)$JgLM?=a6D1y8`$;@OFy#y!}1{d<k)oQ$^ro1c2=M>wpvV-}OKvq0@_z
z0#bdg)X(|)+hN2K4gwD;DGwkP^N<pD07+UBB$d4m@j>DEG4OvAh{;>gQwTmrKpnUb
z_%!e$q>5VQCQWG9yw_MBDSm;Aln{Wk-1Yss_}z%t{<V^I5%5Ne#T?-TVktL~?)hY%
zXEQ#)%MkEf;1$5Dfb$SX6aws|q>foio<<MrwSj{Be5m^r@NG(Jp4gy4C&jb38dwLs
z6w%7rq<$gKDms6WFsUk2r5gAq@EPD1f;_)W{*mzk);FWw5$(~>9l*K3%k;BO$%&EH
z2^pDWYMwDX_-ldhkt(4y_}mF%4aEq+A;c0c0$vN8qrc(q?bb44Vq@-g;HRsAFJd^4
z6ay0$Mk|2}fc3zIz;lo&VA7&DL>Tyoky>Cg!S?Ai?e2e+fY`I1h<*is0q}AplAJ+2
zkLZ*P1OEt81>PRsP^IRmq>&sl=5lS7B}&G6;MGVju&TuHc`}O-xgB^3QrSiG`voVU
z1R0R^7thy)zY+<r%jm2lWsYwTFrq}%fmS!wX3yK=K~WX+7psvZXaf>S$~I<g3mgJ2
z9Up0I9v**d*2hO0t&-12rRQB?r;P;Bnk~Fes=-}II-J{7iHMo|V&Kf6F<My`q$%o6
zGUx>)z?n!7?=_^(v8*N9IHz_%T%j!Jxj>}HunMU&E>`eiy-*fVgS0F@HVKG;Ujlp_
zcoXeOlD}_0OR)8xtt3$5nIlg?1pFYP`FD^_d(D4OJb|RPWn>L-+A&E$q<!6wbeFCq
zZDsjTX?^@nNY`h^T?@sYTMC>UnX_Z*sS}KVPk;{rpCsGLvba78+zfnKuRTcGK#7Ts
z(M?h{Cs7NiavBr?UjyEQ6fAZ&AA&!Cw5~QFP1XtEo_VG+%QzQtr2Y)BdjfpXV?@js
zb8~-^pLZf=ePRyyUC61<jYw0~LgMYDX>O61e;#SuuCioa83`uNyk;`rSbEPDz~_(@
z*!S*@h#g2ZcPCk&upIa)Qc%TO-!|T#kxX(gP&p&4=YSs~-Lw8<_n71I=5Ehk0^AUQ
zx2&)R{1(|7qqH|Md}H$t<`0X@faTquI(dI5XbV}396szrI<>o$<$Z|5nx@?nJixag
zUD*@JYQ7Hq2C<Ic6EB)<4fi5GVTgFX0J62#AYJ9kQVR}5)+3$Ob$WdYX-@7$V)PEA
z8L?e8^$6122T5&jM&8K@&AJBs1Ub)pkl>7Ne54T`%q#`I54@hV491OT_ijWYObvf`
z;Ms}vyGaL-4zPirMZEVQ(jFfMUWYiWNhRV@)m9(!O3LYh=56sm2R?`#on^o~63kL2
zfnO;B;bBP4jk_iwr4j+YP`N<|zZ{9P-m&<Ub_r=Ba-mz00kA#Y2iyjH7_pWp_#7EU
zw&H1IL!JFS#Qf2sQ0i_WGpf;zNWOo*nY4thx%&-Vi!_Zj@LpSWB&1yvf*&7gM8WHC
z24*L4KgAj0sic)*rCcBkF;;Wmi&(+c$gz0X^78e4?0{nm_?nLKcOvKV1!4rYR0&1V
z;Mu@AN?bJpye7s+8vbD7N#Ki!Xa73l{S9!Q$=Tw6hMeg=P6^Ey$bF=*wZwm-#Yw<w
zbD&jff;kI_baIT*ZNLYBcL8??3y2Yb0-qq;C@m{S<ZjaL?`+P!r&Jg}OF&43T7#K-
z0(=K}GjKg}<XyBk&j$v~qB_yMe=&=6JK7O_*gyf<22imkh!#Tu2`zW;KarC4G9;w=
zg?L#(nx|JSRBYaRkT+2Btj>Q<q$)*%QvCoW#K-qB#1c%x$p=ZjbI0PMK^?KSUliPa
z7V-uO^vVJvi!t%m@B`q-#5FUBoCsA~loQ*A-z9azCN}OVz=>5OLFtZ=Bf>~Hh*-e^
zQa@p2EJC`!K-aD71gRai1@oIMCUt}zZ-b6nVgU&?q`3Je@v8AzIsboiqm#L88%zN|
zEWlvt`@#|skYM08DG@$PgtTkhZR^?yyc=np`fPJnzt78i7qRCAII%_SNBVh(XxH|N
z;J&J2)^<PQ3@x{?(6|MuVLVw2OF(2Rj3O^8c!&5*WN%isfM6R;BX4_qN4y<5D&IoI
zqNo>baeF28df>053Cn-Uq|T|^Ls$d-BP2EMLpn=uQ}F&(z9U0GU<GyHPrw&Qi<i5Q
zLWru1bMx5qdytncA3)Oct#npsWu&Wf0oTc~eSRBq{tsy})K$Ii#H?r|Qo3irSM3P(
zLX3b(WKSL@Erz-V@47_*<BpK7z(WswKu|@3)C)ZWADPQ{pt~6Y-&1jiC$-prQSIeC
zy&U(y#f47`a|>5ClV}JW6*4qbF*iCfI65&lEigAaFfd%ULCBMt2pl0YG*mG+Ix#pp
bF*YqQH##sdE$jJo00000NkvXXu0mjfSMaoT

delta 2192
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
S$z?nM0000<MNUMnLSTaFX4q-~

diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 9ad2d5b4ac24e..58f749a4ade01 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -265,7 +265,7 @@
     <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
     <string name="accessibility_wifi_three_bars">Wi-Fi three bars.</string>
     <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-    <string name="accessibility_wifi_signal_full">WiFi signal full.</string>
+    <string name="accessibility_wifi_signal_full">Wi-Fi signal full.</string>
 
     <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
     <string name="accessibility_no_wimax">No WiMAX.</string>
@@ -439,15 +439,17 @@
     <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
     <string name="quick_settings_user_label">Me</string>
     <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
-    <string name="quick_settings_wifi_label">Wifi</string>
+    <string name="quick_settings_wifi_label">Wi-Fi</string>
+    <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+    <string name="quick_settings_wifi_not_connected">Not Connected</string>
     <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
     <string name="quick_settings_wifi_no_network">No Network</string>
     <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
-    <string name="quick_settings_wifi_off_label">Wifi Off</string>
+    <string name="quick_settings_wifi_off_label">Wi-Fi Off</string>
     <!-- QuickSettings: Wifi display [CHAR LIMIT=NONE] -->
-    <string name="quick_settings_wifi_display_label">Wifi Display</string>
+    <string name="quick_settings_wifi_display_label">Wi-Fi Display</string>
     <!-- QuickSettings: Wifi display [CHAR LIMIT=NONE] -->
-    <string name="quick_settings_wifi_display_no_connection_label">No Wifi Display Connection</string>
+    <string name="quick_settings_wifi_display_no_connection_label">No Wi-Fi Display Connection</string>
     <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
     <string name="quick_settings_brightness_dialog_title">Brightness</string>
     <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
index 160cf8fd25f7c..53be1dc4fef5b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -654,6 +654,7 @@ class QuickSettings {
     }
 
     private void dismissBrightnessDialog(int timeout) {
+        removeAllBrightnessDialogCallbacks();
         if (mBrightnessDialog != null) {
             mHandler.postDelayed(mDismissBrightnessDialogRunnable, timeout);
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
index 27cfab1eacf57..e2190fe13cca4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
@@ -64,7 +64,7 @@ class QuickSettingsContainerView extends FrameLayout {
         int height = MeasureSpec.getSize(heightMeasureSpec);
         int availableWidth = (int) (width - getPaddingLeft() - getPaddingRight() -
                 (mNumColumns - 1) * mCellGap);
-        float cellWidth = availableWidth / mNumColumns;
+        float cellWidth = (float) Math.ceil(((float) availableWidth) / mNumColumns);
 
         // Update each of the children's widths accordingly to the cell width
         int N = getChildCount();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
index b26f326fa8dc7..3f74388f9c99d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -280,18 +280,33 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
         }
         return string;
     }
+    // Remove the period from the network name
+    public static String removeTrailingPeriod(String string) {
+        if (string == null) return null;
+        final int length = string.length();
+        if (string.endsWith(".")) {
+            string.substring(0, length - 1);
+        }
+        return string;
+    }
     // NetworkSignalChanged callback
     @Override
     public void onWifiSignalChanged(boolean enabled, int wifiSignalIconId, String enabledDesc) {
         // TODO: If view is in awaiting state, disable
         Resources r = mContext.getResources();
         mWifiState.enabled = enabled;
-        mWifiState.iconId = enabled && (wifiSignalIconId > 0)
-                ? wifiSignalIconId
-                : R.drawable.ic_qs_wifi_no_network;
-        mWifiState.label = enabled && (enabledDesc != null)
-                ? removeDoubleQuotes(enabledDesc)
-                : r.getString(R.string.quick_settings_wifi_off_label);
+        boolean wifiConnected = enabled && (wifiSignalIconId > 0) && (enabledDesc != null);
+        boolean wifiNotConnected = enabled && (enabledDesc == null);
+        if (wifiConnected) {
+            mWifiState.iconId = wifiSignalIconId;
+            mWifiState.label = removeDoubleQuotes(enabledDesc);
+        } else if (wifiNotConnected) {
+            mWifiState.iconId = R.drawable.ic_qs_wifi_0;
+            mWifiState.label = r.getString(R.string.quick_settings_wifi_not_connected);
+        } else {
+            mWifiState.iconId = R.drawable.ic_qs_wifi_no_network;
+            mWifiState.label = r.getString(R.string.quick_settings_wifi_off_label);
+        }
         mWifiCallback.refreshView(mWifiTile, mWifiState);
     }
 
@@ -319,7 +334,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
                     ? dataTypeIconId
                     : 0;
             mRSSIState.label = enabled
-                    ? enabledDesc
+                    ? removeTrailingPeriod(enabledDesc)
                     : r.getString(R.string.quick_settings_rssi_emergency_only);
             mRSSICallback.refreshView(mRSSITile, mRSSIState);
         }