From f2d9199bfbe13f47dd7e29454174cc96ade1487f Mon Sep 17 00:00:00 2001
From: Taesu Lee <taesu82.lee@samsung.com>
Date: Mon, 29 Jun 2020 14:31:18 +0900
Subject: [PATCH] Fix NoSuchMethodError for getTypeInfo()

Load an icon image for audio files from app resources instead because
ContentResolver#getTypeInfo() is for API level >= 29.
And it includes size-fit ic_photo_library_light images also.

Bug: 159987488
Test: Manual

Change-Id: Ie8f766f148a30e105e598e4b7e6b1b22bccda6ae
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
---
 res/drawable-hdpi/ic_music.png                 | Bin 0 -> 326 bytes
 res/drawable-hdpi/ic_photo_library_light.png   | Bin 994 -> 468 bytes
 res/drawable-mdpi/ic_music.png                 | Bin 0 -> 230 bytes
 res/drawable-mdpi/ic_photo_library_light.png   | Bin 772 -> 339 bytes
 res/drawable-xhdpi/ic_music.png                | Bin 0 -> 431 bytes
 res/drawable-xhdpi/ic_photo_library_light.png  | Bin 1170 -> 579 bytes
 res/drawable-xxhdpi/ic_music.png               | Bin 0 -> 634 bytes
 res/drawable-xxhdpi/ic_photo_library_light.png | Bin 1521 -> 816 bytes
 res/drawable-xxxhdpi/ic_music.png              | Bin 0 -> 759 bytes
 .../ic_photo_library_light.png                 | Bin 553 -> 1041 bytes
 .../ui/mediapicker/GalleryGridItemView.java    |   7 +------
 11 files changed, 1 insertion(+), 6 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_music.png
 create mode 100644 res/drawable-mdpi/ic_music.png
 create mode 100644 res/drawable-xhdpi/ic_music.png
 create mode 100644 res/drawable-xxhdpi/ic_music.png
 create mode 100644 res/drawable-xxxhdpi/ic_music.png

diff --git a/res/drawable-hdpi/ic_music.png b/res/drawable-hdpi/ic_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..033b4023b60ef673f47627ad35c64d910e0b98de
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VC405aSW+oe0xE#ped1o?ZNqc
z3kkkM3gz6Nq+1dto|&A`-*2#7f#bP2OQOKP4`=e%u6@n_>)-dns#C!oAaG$4i>ihr
zr&mCe(3Ax%clE(cFBOCklC0_qWucbvo{fjZs^5HURkizYX{W-T#KvRy{brP_aX8P}
zvSiyFO(}a-4&~{p9PcfDhc->q^A@OD=XK#sDCeymT8`}Dsw;9icO6{VwqWt`o7V)k
ze70CE)$~j*J;wRMfn<{kUDE?mzr~h{y;yv4p71>{UxSN%Y=?uCYj)k=a)n3OB(MC~
ziW0_O5x@7V-t)em&|q0+!StYkH|@pLbU_gK$a_5F!mO<w`&)qF!{F)a=d#Wzp$Pzj
C(Slq6

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_photo_library_light.png b/res/drawable-hdpi/ic_photo_library_light.png
index 1f71a62e584d5b9d01e86456eb693f94c625d915..55b956ac1a1ee7a5df765c47a214e8b8d5d791df 100644
GIT binary patch
literal 468
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V4Usg;uuoF`1TfK+TjG5wvUS>
zx|oVu7B<{XxWU-O*p|pH!6s4Ek|fb2o2b#0)UZ&aZIJ|*L|0-3o0r!U--q7+KiV;b
z%$i@JTBH1YPVqTereg<e0~n*vtrz{kb>~atWXAbNR<fvRHcmT|J(25q<Bq4A4O)-B
z&0~7ez9Uzd;b@+R1Dnx=MxGRfS%+aPW=V|*s30@zX$Q6{MlrUmJkFj*%?*YZ3hz6F
z?f%AdgI{z7i`K61+%cvx_VP*>q-HQkZde>$uKRzXgwO@K8CUD-dH-Cz7c<{CNl?VY
zp7X$FsizY?`pbA0Y<kMM;)urSFB#wYmXy2C3A)`GIE}GVXTh&`9emX)Zjo#vjSXMU
zn!UMLv*hw(S(X(xf1iEPD3^cxukp*fFH_{+esQQO7h-?1m+9r*m-Y)@$ZMp<Yc`l2
zd8^AB;CLr5n8CO4?Fase+6$&Ncqh2d33Hgnwc=mXca|E4>T{b-KXAm%(OcX&2jpSq
zxt0@@D}Z{pq%B}FnDB3#5eNr-&(~(Q1O{c`FZP2>LR;s3ni>F%Ee20lKbLh*2~7ay
CH^Bq|

literal 994
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+eS5K)hhiu0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@(m*F9YvLn00zonfDU#X;a`eQ~+x4{;%Z
z5DyQL4z7I+_nAAVF=?sX3Q+J`v7nJD@bZ#{%N9C$1Sm}G;}YOyRRMyXcWk@nnifCP
zdv38WMJ4;q*Q#%CXV3ilMk?7QsAfyy-|rf&g~rnM4h+c-+%INIPU2#&c6)Gt*ITm-
z=MS98F<GE^hQor*=lIO4BFx(wdlPmGIq&=|_<*rMcE(Nh89LDixDyy}_^{l3(dp$B
zbo*<v>dnC7Nx8ON$#0)+da=y^faL=BuBB>A{JR$BA6WWkpI@uatfBym8Ow}x{ohz<
z>X|cGEzQxqVClS@G1rT&$;v3@K+cN~)+KXH7BJo_I;^vSrKY_06T^W&>V^(y9nY{B
zu<JeT3G|e=QqX?s%wF=sDAOUS|J{5Qh29<WH53F-wJX#H$<%#3y(f1~iB!TO)0SSb
zm;1}l9^AwGH)qbqU1u2nFy!s%>tVdZc8~e}AGuW<R8Ic+Zm*ts)4M6v^YcAB{mi4c
ze=oiCaM|~rPtVU@H@{_)(sTp=zp>j>vX373`+r`lVbj6q|LSgiHO{YB%{=usYJ<J*
z%hDME$_+-w@+xyRL<^Uz?wwL%xFy|T=lM#{c<*gljHljC+M@NcYk&66+wF0RIuouG
z)tc@w>knmEH7S+(D^~&k4~{vEyOw@RRe0fjRDMa)``+6X62HXmhcQkmXJ6i+S0KK_
z|F8UpiCllyF~@v2JjQg2c^z~20ohANh1=97Z2A(T|EuM;!}?c;c08yGx~<T#Z)Rd*
zxgmQE+p|W|2TiZ{RDAP1`j6-9T~Y5xx)1oD&Z;`X{xL3*dHcig+>0O9mN;daF=!~A
zefoyaU}^o!P4f@=9*8;=a>n|2U}2a5W3F}Ugl}HnCc&q=ruf=7o<5+pJ7>1_KgZcm
zy5{)0b*)rWS#NBsWpJmkKF!`wX||E`{uKvyWd7KAI`G?c-^C4U1<y6LF*Ti(@wqxR
zX$x07pYO&ac|3nv)xu=n?RF^h0j71;64!{5l*E!$tK_0oAjM#0U}&OiXsBys8e(W+
zWnf}uV4!ONWEea*N(N;VgofPwl+3hBga)$^10yQ~V=E&Ih=%TmyWRmcFnGH9xvX<a
GXaWFW^`Hy@

diff --git a/res/drawable-mdpi/ic_music.png b/res/drawable-mdpi/ic_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..106f912ea799d642633627dd7f0eddc43dd638fc
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtwVp1HAr*{o&kIgr3Y1{Gz}|e&
z>bd&zJ9lg67ICo`bBP_EBi7WYuv}q>Wl2`sznS}97e%`q*(8~Hvynx}L!pr+s+3b@
zf&&wnP)_KTJtt9cP`>VCuvr6NwauO~eMyJ*$%3m`t7fD!NY5x<FuyusM)d)6_I096
z=9lMcv+ymu9m<j8`}x4G(1yhyzpdq3^WlB5ddXU$H3eVd`qzcF>hkSiOmOJ;?e2)!
aqMkkJc<f<oYX_ji89ZJ6T-G@yGywop0aP~t

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_photo_library_light.png b/res/drawable-mdpi/ic_photo_library_light.png
index 322d486c45270f213da1155c567cc9ab716e3904..26c58f305b93c19bf172cebd52b3778b57ace8a8 100644
GIT binary patch
literal 339
zcmV-Z0j&OsP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003RNkl<ZcmeIy
z0cHbH5P;zzfJFg|B7h<YdV>NA=mBz+q6Y|yBFGVf02Vny5Clb06c8+m;48q=CQbD1
zzNF>{ux93Cz250XQG{zuvDSVoOmLOz_yM-M?=1-ebNQO20Bq%Jl>(5p0BE@YXoi0b
z2tWV=5P$##AOJ5|Tq<CRJ_>Bk4KPDxfA1(8GjC9z3t)``B|d!b6SqIiy(d4Q#<212
z9d>9oKCt^SH(>nBQO`&0U*rPJ_RQ;}!V>)>_7`~V8n8xjU}lN3cVrl%?h4TS?~{dx
zt^ng+OW~;vKrLUJ6o5*;rYQg;>~!B2*M9{x5f$o=4xeMtYj!#ye*x&I0Ms&;0#IE#
lV1(Vp01~|O839ogeE}XL@nXr1JdFSV002ovPDHLkV1nSng7W|X

literal 772
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&)RwKRsO>Lp+YJo#ve<>?qK-U(WuK$^y;_
zyi8&_0<+&Fu*Wnd3v6U8;xX&UE@1C#Xkp=&<Bk(@tkh7@QU7>8>EE`~%D2z3cxmli
z9UEF7UK;vUg~_ukiSdMwS7)k7&g9BDt*#6V%n7E=CJR{pu(ee#wsv1>@T>NL<c2)U
zzejiG{N}#F7RMl~lIk~!Ykj!N-f-9DS$>h<o0sfU*`>IhOEZf3)UB7d0$!eQkG1x_
z=X0Qr!#plZ`V_0t&gRbtve)M`s53s$F|iCV&&j#+|Bt-L>J_>3qM7GBeUkiN&nJDh
zO@H%Y9dV!E&*n3T%<0S&v@sRG7d>l{YYEerhUe4dZ@g38;5_wK^a0z~=YEwupEjv(
z)^*jnlS>4wzD!-xX#J;m$@@v`S~LrMFD+kCuaN0{DX76#Ti)vy*SS3JU9U?8kDZqF
zbiVz@l<~&aPtLDnCY3l|TBW=*V|UP{Wu^0Oq?t3T^mhsUc(f*V*{qKD4X+RIr@5Eu
z^;A8561bPMh9!?_ag`|Ni`y0KKio{W94S#-sdoIY=>zQ#91@IkB@U)H$FTD4eaEP6
z^7>QXVrir22R#pZzATbvIDR0L`8iXcQ_AFLrv<+>Za?=^@bbosPefn;oVRU-+h3n_
zalTv@o3eA=ZReghGHNV6(vr>p_rRU9O~*ve)-<{_gw5CVeaUZBvFC)q`yb7~)Sz18
z8c~vxSdwa$T$Bo=7>o=IO>_+nb&X6z3@xk-OsotHbPa$EgXc!cprnM*kei>9nO2F=
gU>0IvWMyD%Wn=--(EV`NJD>&zPgg&ebxsLQ0Ipy#e*gdg

diff --git a/res/drawable-xhdpi/ic_music.png b/res/drawable-xhdpi/ic_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..1de4c3b81454174b49c939201c6e876752538d40
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U@Y@=aSW+oe0zh@?MWd++e3RN
z4#gHegZ3AEvJ0HwFp9}4l(YyaoH1l;X6P1RYZee|{-DDYxjNV6v+(=k*6+;sr@UA4
zoTLIoWjS7qToaf?6j(JJxB?nP7BFZ!Fa|X+rBpQhI4}i^cm_hv5(ZWeMlOLlkEM!r
zKD4O+IV59W_^*|*N%+o#oByki@XO>$Dp(v4jmyd3>)P-@guB|{sqL8!O-wzJ|D?D!
zq+1*j;xb@Zw~&GP0ncnEo~Gzz5eD}gA_)R95-S+)h$blLa2p7Ou}YjsV3o)YWw>@M
zQlx?X@fq#|dkfcbA6Qy=j{AUN+}rz~r<l*Uy??f5zQN(ue=853oRT>G%hf603wqpl
zZ$EHw%KpT*`(^2^mo@*leU^2NNH(k0nep)A^~i01{0|xCeaxzsj(J>g%g^BOpUH}5
zJC5G`V%n4(^GJ?Af;pj8^<6>ZVogXu{Y?AEP_MYfBKOes{lJJ|@O1TaS?83{1OOj1
BrThQ@

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_photo_library_light.png b/res/drawable-xhdpi/ic_photo_library_light.png
index 1f5a69c8b8a836201a39caecdb934745d8e8ccab..627ff48f3318cc3c31f76d72006a0398add3f468 100644
GIT binary patch
literal 579
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#z0(?STf%Jd+g189BBS2f#N`m}?
z8C05&-~YeAT7sqf_xIw(lMQB1-!5?bvCe0c;Q71bFY`Qiu6I~{{bF3}1_lPkC{Gv1
zkP61PS6KUwIPkb!<gz$?=FE5dM@62e=jCPJ@R#`&<dwDKzvc8Lk$R1v7KI!u)Vey$
zWu<vRkC)=bSr-<nvhl9Cl@xfr{6&W+=d2hXu8bpU_K^*Fh7TC|KOFOAvjNf-2bkqP
zIBYM!<q-Ii-%nCvTI0nZC5^vW^p`zjIQ#6=Ri^x)<c4XhKSkMPKa5?P&UK-JB_}JM
z?HD^>F2{%Zoc(-0GPi_gJPb|!SDG+Oib;kc--4Na*%g5YK!!8-k%hU9tQ^rmMOJnP
z7!OEV7!<yE!NC52C!T#-W=R9{g|tR}jb2`z1&=QnHcFPrSlJw41d<8|7@2$yGjp?e
zGBc?;n{E)B?89qvR3((zdgBV!EQV^s6;AwX_=MK3_#>T=s6R1ERD<!|g&6M*doHtm
zX_(7yQ?QzmIpf-LJ`;c08*{B1{;p(RefT7k&KrNp2S4kZ8j9aZo_(4m*LVNlN?^P&
Nc)I$ztaD0e0svHOC?o&?

literal 1170
zcmV;D1a13?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF000Ar
zNkl<ZXx{CbyKWOf6o$XC9TLbz2t`yNAvy{!5*-mB@eI_^<N=_e0|Du1KtfQ_^BP<w
zst6$v6;co#K?)({2KN3GJL4UX*Y@t(Yda{vG}`gZ?ws?_Idf+BjA4(%<b6O=U(Xjr
zQ>ZbmA~P!xC|<GGC~eSzX`RSyk>|^-6&Tle15E?ffZU+b05(0@`CTBGi3m6i+y@qb
z$uhMEc7Zp*9pIy<Lq5w(sz^f8SxKvk5vhDQ8LN`cSRI^8HGM0K1)Ldf1M|Qi*IjaP
zR+zW4Tf8Ex3pwAL0lol7?eAemAp?8|P7<#PV~kNI3wWpiQ$tcZ4O2kXZ>T}f*j{Rg
z=@&I<Tg`0>mmDVhC*Ub)i2d9#67YM}O7<i`vO&xMpMk@+{U>k=*ci2<y$CoMV3v4?
zg?JYnR-`F}v?!zw^|3@60n?#AmdLvgj2-p~j2im{`h@?+x#tK(#8J-w!W$a`y=Jyy
zWj_KQ+Ipjipd#PIS(G;^bzk`^@DjLX+s*@*yuQpBv<2L&$5UGjtuq^01y_LUz+YRg
z0bgxjes_{&?6>Beq;>CmbltX*(jR^g*X?y#(zGqhUZ1;vN76+*Uey*PU6!=lVQlx?
z*T)Rf0<yFB3s@xn<lD6M4cq4|aRYemwfQb})3el2E#PK<F=b{Kz55<}{RG9eJqgC_
zYJouzaDtwtDCg?WCB0LUnlWl8;MxvIdJ&9W8i9uA_wK%m9nW|Q&r3R%(jOK__=Kbt
zJ9eWi0#5lgN#_(KoC+_dgv5fR?Lbx=fqwP@w^7{%-UCN~y3!K>CU~Y7YQS6KbmD_<
z&*dc$0Xx7PaRieUvXn!)tT4pcKaoVs9fBP@4}l7ChT;`))ee4uc;?H5tgK1mP`inj
z;LYQ+&JC7;AC#Y!_Av>pTG_EO1<nT|OZWqD1-J)X01lR{{5HvY_+)j6Bw>t+XH`k^
zb`JPvuMqF7$L-bK;~z2{$~g%|PzSbby(v471x#>-<c)Ewc~c3;OzLvP<dB7c8%4$#
zS1<JLo<Y%Yq8!@J#<CJ{nYubKA(fuxb-CCUH|d6ufFI}mT<I_rp8(cKa<Od(dff=P
z#hDi8XG>PzmtQAmHn0LsQ;jmt7lsR?J|TCEI;=Pk9bCu@8r=y5B!(U5Ln65raT);_
z(q9P%fi}%D#N@Kk@sAz<CH?_1EM9@33(NZe001R)MObuXVRU6WV{&C-bY%cCFflYO
zF)=MNHB>P;IxsXkFfc7JI65#e=Q3lH0000bbVXQnWMOn=I&E)cX=Zr<GB7bTEio}I
kGB#8&GCD9bIx;vdFgQ9eFpJ^3?f?J)07*qoM6N<$g8yCTHUIzs

diff --git a/res/drawable-xxhdpi/ic_music.png b/res/drawable-xxhdpi/ic_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8016cc4f4c5a04c9de94aef7f192742a3c1c52f
GIT binary patch
literal 634
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=rUm$fxB}__gAW`~J-PzuGNY0p
zzhH*{EY9`Q*B`&Xyxf6<Cw%ey&+f&y;~z_yJdgfv@muD6zQF73-Lp5J-abEB<gmhI
z9q;Os46A$@7#I^hT^vIy7~h_2Eo62SU^yUb_}RE~=A8N>J+s^TJARj5En(4h0f90F
z_BM&64n+v@CIQ5nbl>2JfHRLF7GmnDsab39WthA=8@4;RWX0{*{2$J3u-7uWBFX>Z
z=n+j(5iLu-eWsdfPp(dEzwwAYK$J^)1(#*Rs(?8!xRx@8w0cRFv@W|KI_vDzR;>%7
zpOjJ;vQBB8cFO6lOQc52rVC!t8EbX7TofzX+WO(V^ST*g57bHxbr1VyCEXG;U)hyu
zeP@Z%vbTkkH_a$Jpv$Ie_^w0x%h5ezc^8B~`*9XYmmF;}E|Tu%y(eI~Q+DH`ra3Yj
z7vFZ!`#LG2NK&c&fN=J@AJI>`UG;wiYb?r~Vv%&Sv?HEnV?=r81NTTR))!%IKd#k8
zO-ibG&Jyo3b*9MkD^`#8rtJK%B%%Fp-fY%}-I41LtrHLgf}5YYHYG{?(7f1N1B@yL
MPgg&ebxsLQ0P~<;1ONa4

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_photo_library_light.png b/res/drawable-xxhdpi/ic_photo_library_light.png
index f61bb58c80442a38e551833ec8d6fb9d740bbdb9..cd72bdf17f4c609a8019486cb792100b3de10857 100644
GIT binary patch
literal 816
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=dINkyT!HleK?9h(jaz{Z(k}_}
z3uX|BUw!=k|HF&JdHR2Uu6KX`*d#mHTV}pW`Sk7kSp;rN=zMRUy!-NV=hFu3HImx{
zuBIh2Ffb{5x;TbZFuuLcns>xNq~&3x+VRsNX?gGKcW-iCpJE*xdF!YC1piYkJX@VL
zmrlttiGJ(1eVNtXe+e^=OYY1&8*0~VGOvWwH{B!W-L5ICSSLm8(p#C;))E#v{hCRt
z`)fVJ{ugF_oU7V8a&Ip+bI7sPThV`GSxf-`#?qaoUd*M66C9XQ)q%uKZf+GI#fe6I
zY5(@^G?T21oa}U#S@Rf{hgvS!EXkmAiqZ7ry-Ljm+%+XT{;yx~_38HJW9el#TrOPw
z@Z{HR$M!cHG8eoO*-?0(&uU9T)0@1%-<$d7{uj>pyYbfPe0E;z9JLo&9pC-d?U&sm
zYsM+U_9bw}L=clXrTo#^1-{%?8NC5BCbr&6{OpkEkmy!+q3j0F1X-Yv>=sEg;gomX
z+ncu?Ue<7?;ZV;RpmHe<o)c$Qbjn++Hy&y@0~9*D!E%AxzB9KSZzmc%WY^qHWHz&Y
zQv)=?ts6v!JuhvZb>ak%wfq*hyu=$n7yMytO?=*1#GVp;g*|K0v~!;w_bj`(AX{&R
zEbp$TO;HyW&a;{>b}SF+&vt1pIM326z+Y8hbAHK0hC|9{A0P8zeAxMPrZR7f`|%GU
z-b<Q31pME0x2m;7px}A_`q!6zs&Dg7V11+t3|>JY4~0ev#ci)IIc#6rSd+P6_a%oN
z`n+Era4|pJXd*Dri}~S2QMN;eYZDg~{8M6CIwdHJy^7J1iJ>*_;afdmN@MVJ^>bP0
Hl+XkKm3Xrf

literal 1521
zcmV<N1rGX&P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF000E$
zNkl<Zc-rloyKfyu6vlsZZO1l=WKb#;2}%eJ1xSe~Qt$^*gMk9Vo0^6WdI}V!;8DgA
z^mI`u5QNYG1&D?q6a=D3P=ccP#`e7*#hi&Jb9e9F$6W6&+D{to_3rG<IiJrt^Vl=c
zp+koS!sTpC63#g!)vecL%A2gtmD7-opoo;vX46^fnT!HTNy<V{L{1MF+V3S`C08FA
zAz&96q%s$gG`H}H<p_8Hc;3o!;85L+B-jCd0nPziz>P@uvF<iAL6UlQeN@tAwFj3Z
zJre7XB8LS9Up@+a0i3{_@Dkp9n}{La#a4hzz%#%<fOF0b<BGWy5b&Ilvtu1Mm7JjW
ziplyE@GK>RN)9E4*3PDNvQoG9Q()O--sIi^CM!YU1MzXZ%QkJ)8i$_A`xqsI$=n24
z)OR#*w3-I1UX{`RZIk0fBhV34f#sr`Rcop2lc@%yv!Dtrk9oGn=!hhsU$@W)i86xL
zfj{vi#pnaafbF^kKPZf|pu>y~-Ai=~e9#ydg9a1c`(L9A(iP|ksz66j1v-K%&=FLD
zj-U#31XZ9Tr~(~973c`6K-&qr`{{U5Xfr`W_CFE~=WMGKZ6zptYC2=3@RLmrEYIJ>
z+z2i*=|1iNzwPoB@Q&Sk95@v{%Z9owXj(TJ8UeooF93I}ya-&eXIU+&PJ)7)d}O7{
zO@t?M8+aA?!`|ruSM6S(C{tr$khCu8c0o48ZAt4>)Gx!HU4M{tpOqhzXDJ4DeM9$V
zl*GT^O6pFELcQuDXkg`<q$eUJpR{}7d5j&qp0T>il3etzvwKK7Yjt<qOpqkKW(qA?
zLDK6<o%r_!NvlSNQ}pdFBFRZwlXS75omLPO+~*UOyUC|f-Jsxak{(LmNeGIcJuK<>
zDM)GrL4lmhk~U&XNGxDO(sz=E_RcLyr^?6~L(<bG)6hzz2?|2qlyp-2u9YenT<xT!
zf9>7V+K)S9KZ{2sg}QHA8@m-G)lN__^H&lgij)h_-j?)XmE}xeNoNxo8b?rYt&cSt
zcZw7X?iR>$MfE2jC=S|RCbCRS(4r@bVdnci@NQ9mC5neh;h?O3St)3vkDo+dWrmsd
zA_)otUI$(Ru9<L?3aI2d3qoI4@Oj%er)_i5i&Y1_2mFNp*1xcAi3;?9Z-MuL52hig
za0PAtcpabR5n~%T>YUq->VnS#`5V|MXzmt1^R+H=Vv=@&BL&ZH01pEFG&wAn1%>qf
z6Zrp5?7By0YH=}GP5utM2|t?-Bgheh!Ycfnb+%VG3sYdvWZq(bcOg4LSSO$1)A|qL
zO?gN&k3`92+cjCg20o`G+~mr%52Mw~_+S{0A~Z4E)3JXP;TzyIc20wWIGHO*hqeUV
zj~`Mu@fqx^Gz)j|F=q=nk01I=k3-E(P(o5$4%F>La*jPvmt_=-&Z)+G%mbR8vKNkV
zm68)GWkKk`Id`|yhGS^5j!lf8$%3l39GZejP6SldnZ<&d>^9jkiv=B~`T5e>P6Uh)
zWG)gSeL9M*1Ao!X31EzDCj!bWXx!Rrt*X%mAe)8vO769FZ55C$PL>7fHm$7|iXwvA
zwzeulHWwRFxP@!0BJ_b{>5?c5K?zB1SX&jUK*8?dEGTUuv808jxh)Dg2r8XPw{UIM
zp+krE;Xe^0@4{4)ZM^^h03~!qSaf7zbY(hYa%Ew3WdJfTF*GePF)cDRR53U@Ff=+a
zFfA}RIxsNjGGmhf001R)MObuXVRU6WZEs|0W_bWIFflYOF)=MNHdHV&IxsUjGB_<T
XI65#ei{ZNN00000NkvXXu0mjfdl!-J

diff --git a/res/drawable-xxxhdpi/ic_music.png b/res/drawable-xxxhdpi/ic_music.png
new file mode 100644
index 0000000000000000000000000000000000000000..11d67ae873e1e8305e086422649c956a9aabcdd4
GIT binary patch
literal 759
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1lLLH0T!HleK?W{btHuGHWmppA
z7tHXV!#Tcw`ugMd&u^ccZNefDz4~*q$nM_`xBU;xSUm4mNUy%El0SR%>BsYR-d{He
z=3y{w5@cXteB|lk7*fIb_J(Vdw4(s)#Xm_~W>g<J^WA>#b~VG$sz-Mfc6IXtEdhcG
z*1IqMb1O73Fmd1_&Tyj3`6=U8-w<Il(Pydg%^b7o`XcpHYFMXeU!7GKeEPa{9Fy14
zH1GcxR&9%A39+)$yv}R4VD9C}y&ISpEz3(){Q2s1sly`G^NdRypI9!KGVOgsQw{r-
zr`8MZev&nKbGqEYZ6EWlPqG28Echi(mOHF@Z<C<&oKg5WW3VOvj7t6&mi!r8=CFr6
zu~B$woAAyy;h}8;knz;k;l52m>ilchosGU_TH31Q&YyPOIp|wvwyny`zZw$@J};|q
zx?`t%Njb~#bM3ShRrOO=+<2Z_vOnx5(}jz7XNfg6z6;wTFlGC$;N>Zf680vovisjX
z(-GmkyEJ#9#@jnOj_Pl+cSYK7YLF>eeQi3c>dWUcwN9btk`Wnwl6MtiH+|q*wJU02
ziu#Tj>}z+iz6!W3`YV_FTHW$)BWLai&5PF~=dNSbGrRX{$-fmT54HKNel0&~k>;0k
z%=_=UtFwL2PF*oC=6P{#=GK@qlc%=r6@bLr2Vo`=)wXvH^S6Qcp00i_>zopr0DIzv
A$p8QV

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_photo_library_light.png b/res/drawable-xxxhdpi/ic_photo_library_light.png
index 8627f4276787a7a84ff723d84e3951d983c2b4c5..9fe62f462ee5b3f88df6b0886a4a92166e1cc2f8 100644
GIT binary patch
literal 1041
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1GXs1=T!HleK?$zPvV;H~XIv8G
z7tCPOzW(_A|A$xC8wm72=U^#+pDeO}IgiG9iO0>~=lh?YzWuh&XOrOg$-6H*|K5Dv
zJ3Ly2F;PE)fr06Zr;B4q1>>8`u1tplcw8?k{1+{6fAvrN<Qzp`=_mJO=X3~y!QP7r
z7E<b^F{jin&n&%AvoR!p>C00!(fQk6ZGC#q=C=Hm>f@7lmilqMC^B8X&b+mx@YX@A
z-~jjHm+Lmf*!}z!5OI1cvqE@6aQ59-3lB`%x-KAN^9$~-{R@K@`mV_}Z=Du-TO|5d
zSp(2RFz`Z;p^6j6!ATdaS+!rfAmaS&e6~C5&X>K@+PP4IV^K!?Okv};gFn9Q-(K*)
ze5%Q$<ylqi$FG_GX5{a$V{BGusQAWRaq#`GIL7rqZXdlO-N5*`p64cS17oq%iKC2%
z%{3F=RbFOzzxLfs5rgaZbq+jc{$Lo))FxMC$dG?eSu;WL$)^Uzy0VXIEIKVQLI)T=
z>;|gbAh*f3f$`7#WHr_^U%44u7<MQt0##08U}H#A04WqWz%Zi`sI17!fv-W*gR%HL
zD`V1p_oxFg_hlBaAK;nN@O8pv#wvz04jd62mhuk#4U!y;+=|kSEuU+bu%5A<&HM#u
zfSAE`bM_aE2Fz@0a`X5uFek9_L_}pL@?2nk&?m8B+qcE0AdLnIx!%bQatzmF8z+~A
zNE~4Jlp81ZfvL9Y#8U?6C-Tl_Yz7R?x^EfX7z^B&GUyxJx+9k$%HX_>J%aVXgtv@g
zj0P#i2e^I8Qy5n4iZgn!MlZo!^1@2)8=h=;uCnH+GhZuZj6T_LEoc9ua}#(D`1u~l
zWOE4qsJFxFB*TFvau0+$8TK7nwdHoV4ueVfRK4JeW*df_P{A*^POv%zKNOKInaJO8
zZOMn^iwo)-Z5Y<w)bx<x+3jG)a6RgN={YW$zaI-q_*59?=rAyHI502?G%&CzfS55C
zzn-yP@L0Csx$K5-d>LowFmHG)d*RF+W`mD>8M<?rFT_}~C%iso$#C|NWyAdczga(g
su0PK3_w#?Nh6o+8?xRT?fz)rNZS#*zE#3dk9+av)UHx3vIVCg!02|=<Y5)KL

literal 553
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!1%$_#WAFU@$I#<S;C1T?H@OP
zP~KW?pLdYItx03AnE6VlycKIDoy9M5Ph9ar)<iM3tBU>T%(FIWj}_aJkM8^Y>`CkA
z`fUrpu)lAdc%xLT`)HCO--?|JRKG_}>scva{m|-d;jyyofyOVmHyn4jF$;E5dcd>3
z_cw#ggYA7<vH_2GUM@MnIxl(&bCk{XCCq!o8}@KJFfa);oMlyDVB`QZ8Cc*<nFezo
zFSeRz*H-B-W!hIP?^to5Ux<<S{MUTBOYfu-cD;JF*Xf$nTd@aotXH4=`8!To+P93o
z;G{FlL&51cejo8oQMOI1KM+t~-Lf_Rj&skK8MTbTDQmYM`)KF<2FPLf^(%F4?Xy2S
zm7jFE^)b}`omI%Ge!_lM1yftcMen-z%;o~huV=_I1heceXQ+9qmy{yAnb{$J|3y3Q
zx=$h-H}_lGAE^6V)?eB9$9-`wbDPI`-))>Tlvdt6K1Y7RdVA-pGnI_Lei@f|%$7HB
zF*184f8o(iHQ5bEia(bekT@^9oLS3i&$W*#vI<u!-m<)8Hb`hYey`YCazRVgY5tXu
zUH<<yX$UJk)zo$;dq(k^e0$jk@t~k$NYQ1`UFXfN<IUdV%^p&c%G|Q6<Um8@O@_bs
n^w}r;ufER+Rmh@Hzn`H~*7@zi74a*9Nr1uA)z4*}Q$iB}EsO09

diff --git a/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java b/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java
index 48eaa5d..6cf509b 100644
--- a/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java
+++ b/src/com/android/messaging/ui/mediapicker/GalleryGridItemView.java
@@ -161,14 +161,9 @@ public class GalleryGridItemView extends FrameLayout {
         } else {
             final String contentType = mData.getContentType();
             if (ContentType.isAudioType(contentType)) {
-                final Context context = getContext();
                 setBackgroundColor(
                         getResources().getColor(R.color.gallery_image_default_background));
-                mIcon.setImageDrawable(
-                        context.getContentResolver()
-                                .getTypeInfo(contentType)
-                                .getIcon()
-                                .loadDrawable(context));
+                mIcon.setImageResource(R.drawable.ic_music);
                 mIcon.setColorFilter(
                         ConversationDrawables.get().getConversationThemeColor(),
                         PorterDuff.Mode.SRC_IN);