From e2126baf72f007d079efcabd45c7a546db34361a Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Fri, 8 Nov 2013 13:55:55 -0800
Subject: [PATCH] Make quick settings show the standard media router icon.

Fixed a bug in ImageView where we failed to inform a newly updated
Drawable about the visibility state.  This caused AnimationDrawables
to not animate when attached to an existing ImageView *unless* that
ImageView happened to be attached to the window *later* or have
its visibility toggled for some other reason.

Bug: 11257292
Change-Id: Iba9e0db5ba0db2b022950aec0c6f60a435da8ad2
---
 core/java/android/widget/ImageView.java          |   1 +
 core/res/res/values/symbols.xml                  |   2 ++
 .../res/drawable-hdpi/ic_qs_remote_display.png   | Bin 1101 -> 0 bytes
 .../ic_qs_remote_display_connected.png           | Bin 1064 -> 0 bytes
 .../res/drawable-mdpi/ic_qs_remote_display.png   | Bin 846 -> 0 bytes
 .../ic_qs_remote_display_connected.png           | Bin 806 -> 0 bytes
 .../res/drawable-xhdpi/ic_qs_remote_display.png  | Bin 1327 -> 0 bytes
 .../ic_qs_remote_display_connected.png           | Bin 1290 -> 0 bytes
 .../res/drawable-xxhdpi/ic_qs_remote_display.png | Bin 1748 -> 0 bytes
 .../ic_qs_remote_display_connected.png           | Bin 1542 -> 0 bytes
 .../systemui/statusbar/phone/QuickSettings.java  |   1 -
 .../statusbar/phone/QuickSettingsModel.java      |  13 ++++++++++---
 12 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display.png
 delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display_connected.png
 delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display.png
 delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display_connected.png
 delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display.png
 delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display_connected.png
 delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_remote_display.png
 delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_qs_remote_display_connected.png

diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 9e35a236fdec9..7daf798194fb8 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -710,6 +710,7 @@ public class ImageView extends View {
             }
             d.setLevel(mLevel);
             d.setLayoutDirection(getLayoutDirection());
+            d.setVisible(getVisibility() == VISIBLE, true);
             mDrawableWidth = d.getIntrinsicWidth();
             mDrawableHeight = d.getIntrinsicHeight();
             applyColorMod();
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index b85bff4d4291f..8387c9d0476bf 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1096,6 +1096,8 @@
   <java-symbol type="drawable" name="notification_template_icon_bg" />
   <java-symbol type="drawable" name="notification_template_icon_low_bg" />
   <java-symbol type="drawable" name="ic_media_route_on_holo_dark" />
+  <java-symbol type="drawable" name="ic_media_route_off_holo_dark" />
+  <java-symbol type="drawable" name="ic_media_route_connecting_holo_dark" />
   <java-symbol type="drawable" name="ic_media_route_disabled_holo_dark" />
   <java-symbol type="drawable" name="cling_button" />
   <java-symbol type="drawable" name="cling_arrow_up" />
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display.png
deleted file mode 100644
index 02d7fdaa7aec1e04ba27335db82369c067a83593..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1101
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@3Sx*<okc@k8Z`z)S4wYd4aNqZm7*|tA
z&<mATC8xj-$pRw5vQ}J27b<A6hMTjSv#JZqij;0>o-(azvg^hNmo9j<HpzE5zr5rq
zBeUhvhp78zJNcg5oUD92`}*x!=H^%aDBhV<eg16azvn;g5?e*XA`)Bw8?TDw|Mj=7
z=IxX7MhlN^$W?sSwASRpK@R>0tv1`Ue(b*8Dis@ZtbN7mLm{hd6fYd+wdsHS!&W$J
z@)3dZ$LuyOiR%U8(#%h}G@U73^O&LTT=A<m?sLL>b&mh8u$p{PnujeQ-IvFBW}ah~
zd!6N+G!qFPF)xMFW~UBoot_f$w7vgf?3^R)Gc$dDDRbLj3rj5Pb}=pWW%=|~)26At
zP-OihpSo|B^Nwz{Sr>ijz_M(&n*H<EzYe<clWG2=y3FtPhx2FF-kro|<|;6w?2+KS
zgXR_9pZ;_>+`Tb1RpHXi!u85;|LE;$djBD)aKH5XZN4e1g%p)83RHg-)O&EUMt_pm
zYL|a&k8w_3sVZD0l3vL5n@ee}>h@)>Q8PkSb}IjnTmQIEVPf&AAfXv*Mo04YwB;Ah
z7nv&-xAoqurqsJ7`tLN~>6<oA?0tG{dQjlkshx-QRU0!DoIZG4^f(8lTEw2z<Jrqr
z>~(PcBi}vkTa%dGc<a(1vM4<&S-S5*vgWHlQ&`_?`7G<@FzI$U@~6Y%`I1NPvW0zJ
zc3zzIpwXal!+oQ}aR-YnX0*PaVUe|$=aBKm1Lu<Vv~B;`cZK^v-5;UHsRA|vQa=K3
zUG@L4Amw%T&zr&){nnp%yggRO?8Ll$X-Y}xrnj4x-f6d;r0l%>{`>8MM$5hb^Rhe$
zm-cQw5FfO7^StA^-;Z4HdY{Y`7&vXYV5niby59qTPv-6^_5rC6<)@qNcG`ROVAzqL
zcK0UC`jaO;Nxb9i-j3;8r~G~1HM>tESiSQ0+KGjSQa*pU`=q4m+MbQSp3N1PT4Njc
zKg>knT%CB_lsPr`wpmP)TGkzOGS2gP;QtvnmPpNY6S$!qy3G2_e*JwDQ>~|Q`m}%h
z@1l_NX_9BzJ-!e%_Pp)K=SyymxF;fIbz{$l+{UC<(LC`#yvHuyz8h<weF>OjR7+eV
zN>UO_QmvAUQh^kMk%6JHuAzahfk}v=k(Hsjm64IIfw`4|!KS1eRwx>B^HVa@DsgK#
zY@g5u)F276Aviy+q&%@GmBBG3KPgqgGdD3kH7GSPrLyp3Dkxhsc)I$ztaD0e0syX+
B+=BoB

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_remote_display_connected.png
deleted file mode 100644
index 263f07c4dd06f52b00a8c77c2a510611d0fff434..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CDO3=9p;3=BX218JamDbSQx2@DKYGZ+}e^C!h0bpxtpOY(Mi
zVfYV%3-&Ib3>4uk@Q5sCVBi)8VMc~ob0ioTm}Na(978hhy}hw_b&RV7+lTu*ce{zS
zEZ}UK%HqPbNFjowi-mh*;07U=+&|1ZIxO6|u3H2>C%U-^1Zg(4_AXc?@KKms@Q9PH
zj!9DC)#|&oy3gkB-u!xRq44>;n_t*%m^0UMv-Nr7&vj=v9AuNu*>Lc`<XuO7rA2jj
zPo1|?G?1L-qQBz;Uru7z?2jIOZ>Rmaf7mIZWqqO4Mbl-Mo;GwD{yTEGf_49r1&Xdd
z1w8Q&!hDYLR<6vO<+N%>?3)K_e<ma+o#gy|#G-Of%kJQw!t131JB25U7-zY}PP1R<
zXZ&_o-cqJXw@qfp7BNK&Dk|k2cdxLC4^#Y*z3qFMwo=$H!}s-f?_Y5}5*%pI+i_m`
z(Y-g~f{QzL=qvT5RzJ0y@VW1ErIpgYm4C8o?w@_$Cscax&})mCtN*Lj`F*`;@$bP3
zCb78{UB5pX&I`8L@3tUtvzGJc`{swQov}Xnw1R2=qm9ezL+Y)!OyHi%VJhTXAbais
z^PQ=+rYm{0p3KjhlV!AU#)aGp_Vo{4lv6f5*_Jag?CdJFo$Mba=N$|Ub$K>rtH=h8
zlqT(uCUysVy-K1guU4%T-d1|~tHr%9>$f(n{8{ukcj=0%`)3|r4|1?|2zeC$knzsq
zkhborZ%!G+CHZ*&v6*+Y`$nEv!mcC#*TgvVS|~q_`LIc-bf5Pl<=&G#f{lDa0m*f}
z7VjT<)?{oG-g-x(r^3~=F>8Nr+g~yMhar>h8x>!PVE=Tc?19JSd&fRkI9hTa;Qg_2
z+x5l@*Sn4SQ$uaLqeY_cpDQnaWGi#_+pi7gw;Ro;q?E*MeEZF#lIglupO58HUO^*q
z@BfyJA140{TKI_n>4MFZ-!43VWWV|S?<`lkHtp?wG0V{XgI3+-=Pwv9sQ$E`a`c_R
z<70}?BTUmi?G4hBIcn-`ke{hKznJ;+3x09gK(V|}ZtZ9C^%FPM|A>25_G>|*v8wI!
zR@G<sX8#W=TVVD3YDGxlr+s^?R>{mbr>R=q{vvgu(xQ9M=Js^Vede^r|IM?{KE*q?
z>Cdl!%^dz^&!_G?uZ|YIj94tREPSeXtE%i8eVM2QHxiovbNyp_8U5+u^;n+Az}%x+
z;u=wsl30>zm0Xkxq!^4042^XSEOd>GLktbAjLfYJ%ykWbq`~2kEpaFsa`RI%(<*Um
U*u=^62&jR<)78&qol`;+0AMxPw*UYD

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display.png
deleted file mode 100644
index 09ae4095d6c2b6ba4a97867c8713a5865f6ffbee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 846
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@(ma-J@ZArXh)UfZ1=;wZxQ;r_dOEUqCR
z8rNz>-MSU$a^alQ1|b$f9nmcUoMmN7b{$ja{%_!T#N4trcT2!UFX^={9Zg=F%GV#Y
zoqX5hk=jj8$1mAw@8%?)Grw>9{LDl9f2CX6>`!fqxwOq~#r5b0RZ)!%yu#TPpY?yl
zwOm#b%l=X*!2dz;?U{4WH%MQep|$Jox=lLOiF1zR-1*1Kmz+J}R3nq|juzVqA{PDA
zUmQCoS9k1>^sl>l<vabRxkOHL^{MY*(0SB0eWP%BA#48!yEmdy`%_P3O-x!h_gUw~
zoSyUoneam6DKA>qdM#fQ*1Jh3_}1Cw@mw38r09w4Y`bnD*0=h`<-X>k6&o8IoCGh0
z+-Uz@(Zjqktbg%=A`T9wxdmYlIp#fPD{Eo8xhkc)W$oI|ezS8AQ*KxpJ@jXp^knjn
zp36H#x6Sj>5R3G_c<<tsrcB?kGYh7E{;%)0AYGt?zfdsWc_q`{DU3TiRG3y?@p~Yu
z_h6-?!?)&`Ydjt-zaBo(URJ;^U1;KQ#c|2e8>R|J@6?Ei&Wft%djCQ38vnyJ%h*Z+
zQmeQpT`F$7$5bJdT*a$>wtI*C?2G3^{#woIxn;e^!RQLx%decX3;h3GTXU%F?0UJI
z!rR)OJr<k4ueH{7om{ewj(ekB*+Vn4j(-WPc3L?HOMT~0tm?V7qWRIqm8OjqhZdB_
zaK2Lb$CGbzwdC*Zk1c^*Jnv77wd`E|@_ujpowP~qCig2|1CxwuiEBhjN@7W>RdP`(
zkYX@0Ff`URG|)9L2{AOXGBmd`GSW3Lw=yu;lyt)iMMG|WN@iLmZViX+6WV|pBtbR=
r=ckpFCl;kLIHu$$r7C#lCZ?wbr6#6S7M@H6rE3OHS3j3^P6<r__X}RP

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_remote_display_connected.png
deleted file mode 100644
index 780cfc8b32f720034cc05a429c57f5b661460af3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2BFf=qXF#P-vq=Dk41`G_Z5*Qe)W-u^_=TC}1>IPKHmgMd3
z!tfsi7wla=87RV8;1OBOz`!jG!i)^F=14FwFiCs5IEF+VetYfg>fS&Rwh#Az&-?Dh
z`BXVr(0S%eZ^O_08mg&nNeU;=_y`#qedhN#dHlqQ11*fMnmiJki`L!V``q^SgV^8m
ziu1o8-kW}3Y2K~3wco0&e@C8=%YJ*b{?F?bZuLv1h;3afc<D#|MmH{#8%>?2U;ap|
z&9>OmdA5a-?}44&LcN+FJY|o>^h`rTJvF}`-obbI;a_f<L(ddKnRxd-Vk&bCd!Q5d
zD6{6q@sKt32?3#xkEeL8?0o7k*x*}HA$Yrxefmd%_lNH-nl)W<wd=P<=U&(Bzic@F
zNcNn=y8{;WO-xn^4c)pbaYotZdnrtNXQVq#T<!QIL*v3R^HPsUr(R1IqgfM{9hJLt
zSoux&UKZ6yiH1x+=T#L(bRVwhdwoNUOC&i!KY4ZO$H2!teXVPk3rtg*pc>z<Z_y~7
z_*%Oqt#NPJk<*&7M|UmKRtP=$JHEr=zJY-J1Dks-LA<{#nY{#0vJ|bHdq6u@wjxPl
zLbF1+33E$&v&9o@zhwJ)4?P4t46m;U_F661W@!G}b@A%2$3Ke6C;eCOdzt0HpSy6o
zg0^k)6Wxa6hR?5WxVpEadZS>o)7ACMPp`PUm@CEE$Y=fe8x6ZpZBNtP_Q>q?_m-<C
zs_r~8HrT#i<7#qG`~AR#2H72*Ul-X&9F){GdpK*|`4hIs<|w@JTl4JmOjVPW+*j^c
zuVc~ds6W%P$oz-#h9y&!xkPvmUAp?^{W1OMWp`6!a%4ftQnkc2q9i4;B-JXpC>2OC
z7#SEE>l#?-8X1Qe8d@2dTN#+^8URUy!y#MZP&DM`r(~v8;?}T<ljjjo1B0ilpUXO@
GgeCwG8&B*2

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display.png
deleted file mode 100644
index 48f90ac09dd1c66bf7c91b950015fa9f78f70886..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1327
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&!-9=Kr29jv*Dd-rn+EqY^B_{vp16Yrpx-
zj++|<q|MY0IjOA45VLa<=yXYPjfm`+%E5iep!0}R4u{aerX#NuRfMCG+C2o~x!0UY
z^66<6Pu{g#=iT1*@4i%jj{90|`%>%G{E$_@>O$^+-v4}F@w=U_?R>IUB`+>4bZ+PS
z@BQVKi4<SE+v1523nF&=9}ZNjWV3#`=gmcZq0d4a*sBd=za1#=m}k&<++bdN1Cy{#
zL-ULC7q@F_EWS|xfUTxEDNd2iLc0BNH`m)pq2QRF;*_$S36eYJ8En3MF(YKzC&`}0
z2mBwHPE9kB{p)eSeTSa>XNHrzrf*y{zwY?%nPz)$<jK6xy~r@JW%8Z~d+i&|r;`>N
zUHh6IXD~x>$9h?h$9EnaVvlT|UeLWj&Hqt*M0m>E`hNXL&$^Pysh2Fy95Ixhp;@Sw
zciiqy@A;1+=Y+4+2%W6r{{Hy+js3o__G=bh{Sh7Tf8&GK^2e9&Fu$hG{6ovGBWIhb
z+zO5pAr@<YKDl*lhs%a<?FGJS9~35SS{b#KbGcE{UX3Rvan~OwCw|ip%5<JM`GT9#
zw#|<`wU-6n`2B%Z?(oj0+!qTov^h)fMi@;KJ{Vx9d!xO2(<i5GI=7sT*wpP=zKLHr
zrq6t1*XmHmi=Hkfveuj_LV}(TqCaxR9bt{Ew4Zn(MX5~q<kFe*xTKe`e^iwV%bh7b
z-zL&UWA^R#&mZ?B$ma#Um6hstJ^E>9two>qhqebs*QYxRZ+y|{TNqaJkI(&aakBF>
zSHTJ2uCw-W%w9SB<8m$Ds~&I6)`qT%iPv25*Re+awY2V^JPwV}i;4X6IXBm7ToYfl
z$7%6KVWyxf;Sa=Zy03rqS6STd8U2a%vw%V1Te1F!sW$2=o-4lbyxx4T<l$?f39GI5
zG&BFO`seq`F1PzaDd!1R{gB8-S0xW#H(rw~Ja2~BeU_hA_C4t>M^4N-waNdMR!QGY
z3kCm@H4j;1G;>O>CCwK4eM|3$4&%uR-lUsa>yA4A(AC~AApfW@Sm1`$lH$h46(a8+
z>)laHshc$4|Jwt<I~~SJ|K0LSUMbkWs8EgLY&|nSeMW+n4BziVnn917Wv^ylZ{vJ@
z-bOs~rb_(to5hX7O>Rr7FR$My*+135qlvfu@K>4tW^8#~e|K<c-zqe_Agpw?_G6r2
zK=6weQAcOF&T#2Mr_{q)?T0ew)_0e)PR*Ll?s0SF{+4{{1#7$=f<AwL^fmtAmfX!d
z3Uq#1&z~Y4qjv4^mtD;FOt)Fp$BVssrYyFWvAT8dVI!p@K^xw=f1En&<_cgeOj7*a
z8oVg=k$cQ4s~vYIbpVC_J>j^wO~!hH-=ex(elIS29$0@!-OTskHkUbk`WxQpdtAP*
z3(JISKk9$>jSP*oPs#(9392Qo5hW>!C8<`)MX5lF!N|bSSl7@%*T5vi(8$Wr+{(yE
z*TCG$z+h9-4J#B4x%nxXX_dG&9JWtr18R^2*$|wcR#Ki=l*-_klAn~S;F+74o*I;z
Wm{M7IG8I&CF?hQAxvX<aXaWG$heN#p

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_remote_display_connected.png
deleted file mode 100644
index 621c045378e025289faceeb30a3535c11ab64aee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1290
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pWm85kOx85n;42hu?CQUeBtR|yOZRx=nF#PcV`A9Vw&WlQpQ
zcVYMsf(!O8p9~b?EbxddW?<kJ24O~qS#u;97?}Tix;TbZ+<JS<z9ZIE<oL()wck5$
z3LMGZA|Rd1<H#+zC1}eBc_pQY$dwV19aB4ch5oy+XiKZIxj2ffX<8s4a?sB;z%U~@
z{eXm!D0AWWy~%~?-_GT2n*F_O{+qp3`wJ@H|C|4LwsCsexfnJ$_%}UdbBu`Ks#QXQ
z#`iB5D&01|ckb-&*k7(j>lvyy@?XBI_rq+ZiD(7e>dzbj$xX)#ITl;Kd&@Pk$FA4<
zqwK57UWsIWza{Kfe_d8twnJ>X=A#=sI0~jNOIscq>T0*I@oLJ4Vv9vzd)66yG1WBP
zK5f)LadGt$;l+FA*X8b5=5>ATvitig8dMJLijoy&|MuutN#K&=#k~9y`34nB<ewCU
z&7LdqkhiAqdqJ#F(yGGGXYyYvdhe_Z3BCGLclzfhmzItj!h-cKr{@b68Yr#vc<y?{
zLg`gUg^toY-|ycJF&9}XKZ@A&-r?5z&4u2AAG2M2l#-STJgRW95fTjDl^4RXs7Ek1
zO`FlJHT#L#{N39^eS<BUl6Qn!Ge~*AU8%2>b1Y3SMpe03W(V{9N4hbK-}1c<YO(7o
z+-NpuuM+!V_m86Ujy|20x54RdxL_J@lJZ-NL`nUOs-E`l$6FUgesS%nTvV~NmtXi!
zLwTXd_6&B{*DWusZofRXN#N##-ybC7j)xxoC{t;zd&KY8$C%5(XIWly*7Ppl68!9(
zy1$s=1kJ~Xr&jn1%fGvJPS)!5BDbQ{8jE)6kA2Hd$7J)xrd(v5{piw{|Lk+T{##44
zh^acvi@$Es`Mi+7?)tKYRww-~M=gB&%jxmA_5z!^@3(xk7F5`>_%K&|M%Ld5tN85C
zTyxW`nVtm3_s;)lbnn=G&mOMHbIR|R$lVisCYZ2juI{{pvnxU;t1O&ryyj}v_1^iR
z4VUgdWZu(}f4Q#gduDvkJfOe_srW|=(%!^N?VFbPcJ{|5TYj)=-2TbAXNhOeoU3l%
zJmY)g)DN`%4b8Q-?>=0?x?kiv%e2+2tnNPbJh$daV*p>=<B~TTd50&T{895KtEPwD
z?9Tn@PrD9S+BEln5O{YzrLM?+{^NtqJGiGW`ThIt|7-dsGJes^!oECb74`{URx0v0
zgS~R=>pfiB$qwJzVs1}1Iw0zFB_gn-)>dKq=RKuo3eAj^uJ!EnNSU8xpLZ<C-(`h~
z^3|tbZgUwdzBp60ce%~nZFZX$^(Gqgw-#Ifmy^%hecEo~=HU9weYp)c&bbHu=iFpl
zyZUJB<`?g4it-A~Bc+#}k9sh7|HfwDlxsCd7TG4q=WVi9K61h3d+?8AJvUdla!#16
z_}g@~%kGo?77Jo`+zsjg3dI)*y}v!zVnX<$x?M9asyg#Te5wB5ntsmv->%dI2+01&
z7~*-<`}TR0Y+(7ITH+c}l9E`GYL#4+3Zxi}3=EBR4J>qxj6)0!t&GgA49s;6fTY3U
hkS%d28glbfGSez?YuLoe^9ZPc!PC{xWt~$(69Cl8JCFbX

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_remote_display.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_remote_display.png
deleted file mode 100644
index b07be828f36923be15a4f879cdcfaf2650a5b629..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1748
zcmbVLX;2eq7~U9V6bfDy4?LCy1%(`&kZU1m4uTQGB`OtXWRolqL$YDBns6FztKdPQ
zO|4aEt<KnvQ0Qf?3Z>fCAx@#rSmjWNiWV(YD2@VRwO<fye=z>&PB!2BefvJodwkDZ
zk{BQB>%G7mf*@b@YGpE5(>?E0FYtf+kWCDh`E*Pwy^hSFZ8$|hGCip!V6_R)B$5eS
zpPS<%q9BNwWk^Y-Q#ETb9cg0Y9v`;dWC3Uhidt#6;5s8g!&)NKV3s0%=Nb^$pqC;W
z1sbl#q9C#itMe#gU0!^OF3+fw=#iDtaFiVb1SW#UVY?~YY{l$SWRw>Jw&$3Gz@sj-
zQHs1sDpivRD@clf1#CV`$3;<CC}g7%0-+EMhk0C-$KisXkcCEI0wKl|!D9~sqEY$`
zELo`<iv@O4B#Wjk7>8rC+1NHdo1`*1s6-<1aPW96;K8!ynrYn5GFyYj8I*)oM;R=%
zfi%M&MqEp7qooMQ^hF6Ki$?R3*lZnZ6lfX8j$1e=o69koJavtFTj^xt-!vxlwx;A-
z2u?C#CAU#Ja32{#<6zLcR|oPqf^4t^$^b3}&sLJUZ6?A@tCdm&d|~SidJGka1tI}o
zAr$a<LNSVpMW{;57js3ZT*!?Oi^e%7!m79tB85sN<_RK{C>q0;sUmnvnJh+#qB2w>
zmW^Z8W-E=Gb;NjF1Bg3@6}=LRDJTM`Nh*aTv&R*Xm_^d0HH);sigiLbRD<gbX3xQL
z&jr1xS4mKY?Sx)MktTSw!<b=$47f3%Toe>9;BiMQ=ka7Jp+KQR1rmjjCr8Gx`v224
z4oHUMk;i}JGJXU!=rLc4A8cNZ4`Bu~LxJI_Zt<0ZnVY0m%2Mp@y_K5c1Ngk%?&Inp
zfB)mH708+*|7UBmD;6Da`r@Kw`JIrZ0Y2*a$?|C~xlV!fmcAeEEMI%!!WQ+1zi5LS
zx{983^3|EmcymQ}CBOS@j~Npbe)^!QFZbi_!Ul4gh|8Ukh#d%;1ZJ55K~o`U6|lf=
z1_U{PH5r0nuv|@G?I;R;-TTM-W@T<v&W5X}wO<b9u7(8nD(cD$s{YtpS28PNQ{3gL
z_e(mqDkDR~njT6S)d$^WBS!}YjA!BY#K{gXh^vVXxPD3UQ`hvHU)8PeL{=V5aJ~2Z
z7FJtK>7no^Rf_h&hO*P^?;rBJWQ39;9h6aiqyX!j8Mb0`Peyp!lHya*`@VQP%~|W>
z?-{D(3~bbXPR{*iL(z&Q<smci!@}P#_Am#mXWrZ{>{ys?>X|aUv(72L;;W6jGZJ{+
z+%(&GSS=1A%ks5p*iQSE?3mX3t@!X8lXq1xoX&Tax;C{;QT{poXmCL1;)_4$d6$nc
zLkkmPv(pB>{Q5f>PJKXrWlotf<QdI$nur_k_Pw>t{WxBFzUH;IWo}mnEABY%bN<^i
zHdj7Ww&4n+EWSQ4(tC>I>mpb8-8Ra`pOmE@>KN2^>`>0V6PCZ#T)8>xaesZEqiFcE
z0z@DCLE|*X-$`fLxeZTC8w(k&>b3_%vn4f*zPn8W)P=!%W^cK(Ikjh`q-E|8k5aq0
z%&Ou*`9T?(y*=e!3;L5f*__}4cjV33#*gMmg9m4R!f~7nj7;tg#N4y=K2?hXYfjGi
z{``%Qgr(PRG4F*vY?D`pxoa$yMBw!niNDxVJI!(RQQttq@Uf`4=*1@+295jvin?80
z==)u;yEr|sB%}#>T9Udz=eG(<4?9-T-sRlSJC(~6D}Hw#JrO2*T-u*@yZYpVJjT7f
zDknTD8lb1f9KWG0tb?_sJD*<L(>v$JZsz3`zs_Sqo0iLbYZg9FIubK)0?j#2TqYS_
Y(0a;p%-_edALtKK$HXgZ<mtQq0nRUk%m4rY

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_remote_display_connected.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_remote_display_connected.png
deleted file mode 100644
index f02d0ab10fa4a21cc86ef736c693f379474810c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1542
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

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 1ae6b99ce448e..2e40ddf83cebb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -673,7 +673,6 @@ class QuickSettings {
         // Remote Display
         QuickSettingsBasicTile remoteDisplayTile
                 = new QuickSettingsBasicTile(mContext);
-        remoteDisplayTile.setImageResource(R.drawable.ic_qs_remote_display);
         remoteDisplayTile.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
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 c2be9633a99a4..5567e7d54c695 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -686,8 +686,12 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
                 MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY);
         boolean enabled = connectedRoute != null && (connectedRoute.getSupportedTypes()
                 & MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY) != 0;
-        if (!enabled) {
+        boolean connecting;
+        if (enabled) {
+            connecting = connectedRoute.isConnecting();
+        } else {
             connectedRoute = null;
+            connecting = false;
             final int count = mMediaRouter.getRouteCount();
             for (int i = 0; i < count; i++) {
                 MediaRouter.RouteInfo route = mMediaRouter.getRouteAt(i);
@@ -701,11 +705,14 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
         mRemoteDisplayState.enabled = enabled;
         if (connectedRoute != null) {
             mRemoteDisplayState.label = connectedRoute.getName().toString();
-            mRemoteDisplayState.iconId = R.drawable.ic_qs_remote_display_connected;
+            mRemoteDisplayState.iconId = connecting ?
+                    com.android.internal.R.drawable.ic_media_route_connecting_holo_dark :
+                    com.android.internal.R.drawable.ic_media_route_on_holo_dark;
         } else {
             mRemoteDisplayState.label = mContext.getString(
                     R.string.quick_settings_remote_display_no_connection_label);
-            mRemoteDisplayState.iconId = R.drawable.ic_qs_remote_display;
+            mRemoteDisplayState.iconId =
+                    com.android.internal.R.drawable.ic_media_route_off_holo_dark;
         }
         mRemoteDisplayCallback.refreshView(mRemoteDisplayTile, mRemoteDisplayState);
     }