From 65ad3da004bc196128fcaedb9790cfa2151a8935 Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Tue, 13 Aug 2019 16:05:51 +0800
Subject: [PATCH] Fix some icons are missing in dark mode

- Those icons are black, they are invisible in black background.
Removed the png files and used vector drawable instead.
- Remove a duplicated string

Fixes: 139101780
Test: visual
Change-Id: Id77aba716a304d38af6346bcdf436a4a9aebfd8c
---
 res/drawable-hdpi/ic_power_system.png         | Bin 985 -> 0 bytes
 res/drawable-hdpi/ic_settings_phone_idle.png  | Bin 1051 -> 0 bytes
 res/drawable-hdpi/ic_settings_voice_calls.png | Bin 1143 -> 0 bytes
 res/drawable-mdpi/ic_power_system.png         | Bin 729 -> 0 bytes
 res/drawable-mdpi/ic_settings_phone_idle.png  | Bin 732 -> 0 bytes
 res/drawable-mdpi/ic_settings_voice_calls.png | Bin 815 -> 0 bytes
 res/drawable-xhdpi/ic_power_system.png        | Bin 1118 -> 0 bytes
 res/drawable-xhdpi/ic_settings_phone_idle.png | Bin 1335 -> 0 bytes
 .../ic_settings_voice_calls.png               | Bin 1495 -> 0 bytes
 res/drawable-xxhdpi/ic_power_system.png       | Bin 1448 -> 0 bytes
 .../ic_settings_phone_idle.png                | Bin 1889 -> 0 bytes
 .../ic_settings_voice_calls.png               | Bin 2204 -> 0 bytes
 res/drawable-xxxhdpi/ic_power_system.png      | Bin 835 -> 0 bytes
 .../ic_settings_phone_idle.png                | Bin 1169 -> 0 bytes
 .../ic_settings_voice_calls.png               | Bin 1314 -> 0 bytes
 res/drawable/ic_power_system.xml              |  26 ++++++++++++++++++
 res/values/strings.xml                        |   3 --
 17 files changed, 26 insertions(+), 3 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_power_system.png
 delete mode 100644 res/drawable-hdpi/ic_settings_phone_idle.png
 delete mode 100644 res/drawable-hdpi/ic_settings_voice_calls.png
 delete mode 100644 res/drawable-mdpi/ic_power_system.png
 delete mode 100644 res/drawable-mdpi/ic_settings_phone_idle.png
 delete mode 100644 res/drawable-mdpi/ic_settings_voice_calls.png
 delete mode 100644 res/drawable-xhdpi/ic_power_system.png
 delete mode 100644 res/drawable-xhdpi/ic_settings_phone_idle.png
 delete mode 100644 res/drawable-xhdpi/ic_settings_voice_calls.png
 delete mode 100644 res/drawable-xxhdpi/ic_power_system.png
 delete mode 100644 res/drawable-xxhdpi/ic_settings_phone_idle.png
 delete mode 100644 res/drawable-xxhdpi/ic_settings_voice_calls.png
 delete mode 100644 res/drawable-xxxhdpi/ic_power_system.png
 delete mode 100644 res/drawable-xxxhdpi/ic_settings_phone_idle.png
 delete mode 100644 res/drawable-xxxhdpi/ic_settings_voice_calls.png
 create mode 100644 res/drawable/ic_power_system.xml

diff --git a/res/drawable-hdpi/ic_power_system.png b/res/drawable-hdpi/ic_power_system.png
deleted file mode 100644
index 3592466263b0bab7ce4ace7750f24d39b80d1751..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 985
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=R92;Ln02poo<^Q5-89%fA?-qCBvVL
zTy8fdHf#?vOj^8k!G6cwH=;qeIqOV*@tZV-B`tKa;?`~Iax-z_S<!m)P1dBpTXq=l
z-hB9O_4j*wmrdZ2dH3whncw@KpE>!nAw~P-ccTE-wAlKXb2=LsW2BVQcQ7o_y)S-1
z{(+?dyAHE^L-K*T&Yx_1gzono$@5xwRO%+zCtYUkOY<0f7d(y<uE=?GiceXbo9BVE
zVxA-;Z>I0_>VzXKmE24b1uccX$zn3cPJ~T)Uuvv;+d<dO$2Y0u*gDHKXO^W}x%{~Q
zh%+Q4dRCWXQVE0ffh~u7WNYW_=Z#@J$GPL1EW<eq9$jy43tpLNbM_waPq_Fb-AJ`U
zZSh@}S6{BV*E(D_4VgZtFCpSgh!WG}9sEBMy(Vv&QG0pL`vXT9`qusI-I&nOl{UpZ
z<yN$$+lq+&oZH!+2Ci`m;yixF<KI$Wj_@TfPuX+sVXtE>Uy?5r!Mu&*{HCZ=VN>sz
z9%R~~E%UzRa@LD!3mEn++#X?lfc0ajWG!zf>+402D{@U(%KT@r@SVzE`?6>D$t_7+
zBDJmiG84S!s=8kbedUl-e@$6|Z?pEU2@|#mUpqeY^;8A^+oD^vU+fpZa<au}*4M%)
z$Fk;IoQcy`?-q}Als*uCeZS6qn|r}sA5RvpVGxyHb56Krc`fS>)!N_#yLwV)zbKz^
zPh|1E%vqcL-k;f}EBrysLe9{#*37TM`%0z`qc_k0KayW$q863^=W9v6Gx_)C)AuAo
z3#Bc%=BV#6jbr`B5hz%}X*2c4=9cq0UvnAFIp;s<PjS;(CwFb5x6&(@>-!g<GS7eX
zEcuiO&q3kH?JKN%>{^e@D15PR?mE~0<i_#}ne!K<7vK9O#V2s+(}TL`MQnR#Cof99
zx$^Rxz?I)OZ)s|3*{4$fu1V{FxcirbKkTjUrz@H5-Q#ogJmcz?r#qgrg|fWs&KI?q
zTK1rx@k^}!nwJ+pc>|NUYKdz^NlIc#s#S7PDv)9@GB7mJH89gPunaLYv@$WWG6izY
ttqcrOUoW1Eq9HdwB{QuOs=-v(*f7KZMFUsb4pX2822WQ%mvv4FO#mGon2i7c

diff --git a/res/drawable-hdpi/ic_settings_phone_idle.png b/res/drawable-hdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 6ae7f5ea9c4fb2b0c0f1c3eda411f731aabaf9ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1051
zcmV+$1mydPP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF0009J
zNkl<ZSi{|z%WD)t5XOJAyU8Z&!DuuHzK$X)2nrt5TfAxT;z`lyP5cLP%T;{*0~$T*
zMf4U$uRigCXao%?_y7e_6qUHyxa(o6m`dC8=*fa;!7xj8*VkWt-Cf-~&>f59`TwjN
zS=E7l`8@+P|5h?Jd5-~YdB&W!V5<c5jhz0fZk=Qe)txpSqwq`=C8U6zz$7XX<C0tu
zAq5=(RuWH*9mr=&ybY|9*h0zVbx_ddz%}3&u*Q(ei(3oa1}1@J1>!PIC0+_VkPJJ(
zOJK<K8#is^#y<qSGHv&PB@TA5LICH1EkH}2Gr(uEcT!FIoCW59SzxPRm9nb5M<u(a
zybqg1dNLI1G07frFb+Cn<eJLa2TYm4PKm$QsE|fT+m!Ta)8{Gv@{p^}hyi&^yp}9T
zo<g?oAn?xg+moh}Zw)EPZsWT^vTm}ryK5bZ`2<`ve#QPnA(v1@ya)j{8UGD4K&WZV
zb>ma)IhR!0E^81MG=Lw#w1-e$VRU~_3l@Ui@CBw3s*#-FE#SLnpsWRH+cf4IiTVvv
z%0?QYU%*d8PP6e1q}y4yb{g?ThQy4Fk!yCqyJnza@%d^;o%pO8Alc5=G-j8<yOXB0
ztB~#ri0g&gurJss^hF-u<t%bA0G`OZ(5}^t_L_`divnq+q6|O8XV@EqH<F=vDo8)@
z%z&H_e=o%<Y(!GkPa2#l;!}WvIP;i~3dpRy_Zz9JIq^F62bh1B9STv$r_>b#*aD6^
z?RwDK16A9ONsN-Y9IA|u&>-;0$#N3dfxnhift|orC+4AGWfIC`syDwCz$IWias8-@
z{{?W5`0xc-4QvC}Nv!t03G4$t7|hb9)6hq}uysAPNfxU6Xj>CFPEwyrUtfJnD%eKg
zoMf9u=shq2Y%oL$t(%a=rKGgvF9tRP>xnP$03U(pz+>R6_;h;9+!P8~g<@N_N{J~7
z-G25Dqbg>nQ<Z3&KHC4^v=D{TzH)^67i?KyIYRxpUqy<1HgUgl=x<8+b7!Q;F6ich
z%*FZ*j1S%49Nxg50000bbVXQnWMOn=I%9HWVRU5xGB7bTEig7MFga8)F*-CcIyEva
zFgH3dFzpO2qyPW_C3HntbYx+4WjbwdWNBu305UK!G%YYSEi*AxFflqaHaashEigAa
VFffk^F>wF@002ovPDHLkV1mNI#lrvq

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

literal 1143
zcmV--1c>{IP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L002k;002k;M#*bF000AQ
zNkl<ZSi|j?&u>go6vsa^oyJr|MMN|R5@};$!-j-~U$sM6X&0qCT_LP22n(tI0F|^M
zLL{WILj<LX?(B$2)k+hoN;K%q^jX|<`p(?mH}g717vdx@H}BnZ&;6e7x#ynq;J;Ls
zOv3kE!dwKDWDKoQotXrkx`IqQuaX5C>alqi=mc7Ug6KqI{2R~@OqjJ1un6b@ioiSI
z4KQx(WrW#ziBjGrn-pb?y!Y#(*I+<31CvJgEAS9FXjqyzTa7Ya5TjGTw0VBW_vfDH
zKA;(I909fmoCu0VofRWnfp%HgC^~8=E1~F<&D3~CbVddI3RxQgtAS(U;49Hfb>KB*
z-3cMn>>2}>8XzHQ1$qr@zhvw+&Q}#>YoAAX<h_@Gwkn1d=z8FVtkaO64MZm>YJ4Lu
zyF#FpwQi5qMZjsG16X4=)KK1$bp>%~M;fLw#`s$=Og^BS9-wAiW<|hv;2N;f0LuYS
zjh&%1A+t29NB%jQmhpT5(4^<YM_{wD-G;lz)YgGCq0<eH2LNdp`va`zflI)!gjs=)
z0xd@Wva$CdP1tmDt?_2Ycs(E>^a+Lhkc3a2xoUJa0YByY7hsjQwj!vzUYKqWUxp#C
za)#l<hKWgWQ029m+npwCN$I~W#o~;aA2J&sH9CFfdyjFZj14O#G5i>KV(2_4W2IZx
z-rmoQL-rhvneTa0ih8++^26QfdsIR4z%qIADZW<~WpBWEG>*GCE$9UkrM?CDL>%{F
zV6g`}X?+e?WOKv`k(8yWL|NERdBzPAx4B77RjPB^P5u$6Q<N9UL7++I?3uFH!U<eM
z*MaK*mec~E5~yAe)G+ZKlOyh(z}?)oloW8~WCYh2_2Ej6I#DyIE0p&*pMfJXr_5Y5
zAf}mHq_qs43^1Hp?0Gq3yw@w?KCq6s1uihReNla7Sc`OH8URV4)SGtV>{E}Y3=kho
zh@m-vQnivs^pb1<9syf$)n7q25#QvQDt3Z0UqC7)0X2bZRd(VUFlA8x!-~RGh-nLK
z7GSM_6qNozz6ACHyMTMR&}qi$9`+0sy!~s+vPxn%2G>`21Gj<q#An8Dg}X$5Hp}Xb
zOtaAbHs=N42HZc|a$I5k0NnC)>ra(PRvrygYWZ7${5_HiYH<Pf|HtGvUS=@cezADM
z0000bbVXQnWMOn=I%9HWVRU5xGB7bTEig7MFga8)F*-CdIx{#eFgH3dFk~daZU6uP
zC3HntbYx+4WjbwdWNBu305UK!G%YYSEi*AxFflqaG&(XiEigAaFfg+j#lZjo002ov
JPDHLkV1lo#=ZOFS

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

literal 729
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&)Rw=R92;Lp+Y(onr0B?8wu$KUPlg{Uo*)
z3l3ZL2XY0BQd|}+x)0exWE%Rq+DbeeZA6?{I3{lJHr(G@US=lXr4u>t<Bk2c$^8rc
zW<D_~V11Ke&#Ke8e97&JXG@;^R(?9^wgdYO_H&Kve#GqR%h_{&{RyK;)^&|SKc;+n
zoqf}1%3jHH%+r~6v9>uV%6WyKO3Rz1@NHf-Uk!IfiFw78b4_pD_9buLuA}$FhK23a
z9VU@Wyj%Bs{J5_4j4y#Rg5}o%c7xSxY|k>-&eiRT7f}conwlZGfniV9UcU@?ZmIq2
zUm7`G%wJ;Mb19v#V95%0hwckawh#Dr<Ug>!S@NV<q31BiY|#gffx8d1-TuA3|K>Tl
zCznfqr^YkK&p9RiYqi>mc`GOQ_XKKhntt!c@_*-~4Ag$#t6%tEbV0|H_!Vu5jBDQJ
z#7=lOuc&9AN5X{e`Hji4GQxHN+KgAO1nM3-{#l~=Me7L;;}Z_&8p;!%7*z>HZ&SWG
zN7X>;^~0xXi6T>44sKU_=Y4&$@4be=pBb!I<1;0vzuO}(y0OIklyXlL!wRvJMjv<S
zBu+Q~p~if~M5!l9#r~(<`DN0*%o)Ejrrl()nEH;TLix<EZ6&$;cB@*7>}R+kylJ+8
zz55bi6swlFMwFx^mZVxG7o`Fz1|tJQ6I}x{T?5MyLqjVQBP&xN*WAj$Aoca)xhNWP
j^HVa@Dxn%ob&U-}3{W(1rR^{UYGCkm^>bP0l+XkKK93sa

diff --git a/res/drawable-mdpi/ic_settings_phone_idle.png b/res/drawable-mdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 92b4b0a7b3900a1b5ac2cf6311b6e9e3c8c037ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 732
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&)Rw7d>4ZLp+XeoqAT!IZ)tu{a#n$&bX(H
z6)a1ZPP1t|a&7SkHX+5{?+PDTbRsrvNMF3oPV1mkZ1+F+<;%Y>_O&?qWR9`%|DU^z
zzaOw)e`&_9(7DzQpTy6d*6Wa{5IHJo<(#c_yn^$^DTnYsSqsEH#a`M?37wK?6F4QB
zFXhh>*Et^Qd_Q)kGR|P}W4$Gs&sQOQwsX7sT;W8Gq9jRK&L0dp9pS}%S&wqP)CJX6
zYcV&qF~}d7HTn2C$2UKG9|X^+dZFS~xMA^Mi5*N@mXhHO-Y=_irZhivySV0c-dwTE
zumAU*K9KVIP)z#NqjqO_HY}L({>bmLU#e{Oi%!04iJa0KKRdJd!R?FdSt<&j2bg_I
ziSC@WYx>;Bk%5{MB0KXoc|F;@^TIw^iH$sQF<YKGe7D&!_0^f}na+DWCA(cxe>HE_
zx_jiM__-$DTecgfFm3w0sYK|(h7&ukN+xhw2!9a0vE1C{^P*i9-)`FpAG@tl5)>E`
z`z!X7-lpH;1qOYE?~m9$;JUz+*O>mm^Z7I{7S?>HdBXR31^0emaH`;YZ>~*DVvF73
ziLd6WZr)gbIq(01@V9YxpHyaF*1E9lJDY#ET=2WxU;Zxx4hXaMC9%~P6eg_ru<{S%
zslvR){KeV=z*tr-ag8WRNi0dVN-jzTQVd20h9<fOX1WHJA%=!lCWcm~M!E*(Rt5%d
vd32YcXvob^$xN$+YB1F`HViQ^v@$lcGKOmC=QJz?YGCkm^>bP0l+XkKcLyml

diff --git a/res/drawable-mdpi/ic_settings_voice_calls.png b/res/drawable-mdpi/ic_settings_voice_calls.png
deleted file mode 100644
index 9277295837647bf9c1bde3a9cd7549b341b24e97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 815
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&!-9CKXQ?#}JR>bFc00_YD+b`*43}vf7ao
zG0p-LI|3?9gtoS@EL<Qkwasm*#8QpGj(P_rrI`kM13X+FMrvfNuxWGKbF8Jq{mf&n
zcejea&#Cr*7N>1#`FzdiwSU(hkISBas77;(_hP2Y7Z!_%vbeJD(_hCbes-z+=|j7j
zf`0@a(m$Gire&Sj_nWOATzB{$bJp}8<xjm~b?<@dx}^NH_~?!VOSQwlZ+_U<_*u2d
zf8qSj-?lmDE`@n+V97t6AyxnQXHi;Ag2e4YtHbq&-{pDCOJTYE@sGt}k-+6G@`t`2
z@J)&i-6ixoqhYy{FYlitzkb;DT(4+3JoE3?1NSs7ZPdFT)h%*nId3rI>Vx7J(mMox
zO|1~$^>=R2RHs`jc6MK4(%)cqSR|rV@DJCSi9hPp?yV2Gsx<Kq#{=y(?<QPMsn9AY
ze_ZRn$KJgD^>)d3+z+bPykzj%QTjv3RI=ks?SYDEm$pSsSuCM_b;X;2*v<8q_*Nee
zHH~}5vF%aygr1gl`&-VYhX+1%are};Sa)@!yYZx`Z66Y*9h;{zan99O-IJH*JMZYX
zuW0bz(a{|GbG?$~@~yeYO}_tGkhb}$v8L%W_p_aMgimf<qxQIB)zt}`pPgUFdG=7b
ztHbJw*#+9&YQA??b|hITulVjXLCNz$><-DD`BOM9Uzpv!Ae-&2`gOK92mNvma-BU_
z-@zQUJn8(U<)2?}wXl&tG4=n^39cd9OV!uj{4DQoe(B@-C-S+5Q{*04sc!}*9Muxn
zh?11Vl2ohYqEsNoU}RuuqHAELYhW2-XlP|(WMyojYhZ3=V34A6AP+@DZhlH;S|wD2
ksjjhMh=HM%v5A!tP%}uwX33)mff^V*UHx3vIVCg!0EEk3u>b%7

diff --git a/res/drawable-xhdpi/ic_power_system.png b/res/drawable-xhdpi/ic_power_system.png
deleted file mode 100644
index 867161683011f22cbb37520368ef63a3b1384eb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1118
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^kU{4pvkc@k8XP)&FaTGXSzj=2J#|o7r
zsuSG<&fB#DA%nW_k#qqe-!Hrqn*ATR>Q{YayilRY$SIfL>ex8<<AqQk-}h&7cAt6U
zcDMf0OV9GstNVZL&VF!SVCEm&4~!Y!k-?{;-OlB&F7?%n7Lk2#b9d`OsY-5@N%5x*
z?KsbP%{p`OqM6mbCs(e&bCEXZ>U_d|pfo|Uf;ES!dXm}FoX8ZhJ==2q%im^r?Bm!Y
zrZoG&x|-vYZZApQtu))?wyXd13kHfmofR)n{ljA+ddO_9*W9VK4_-=1l?d9Yy}fJf
zyhf+gHOxKb=w(ZjPv3bL?$NxgfArYH>cd4&&tLjJXn0fdLv7`mnKw?{+{S)@_q^L$
zzMPJS!YBC)txq@A{N}dQn;0zny3~3>SN=n>C2tRQTP(2hD^QM}Ev$Po{Kx{UhyJ}6
zG*h02Tvt9HX0TGAM0J1eDWT7`H>aqoR-JkhQa-(Fq52b%4>R9f2%i{oU43I>?zBZY
zEFq4MPMS9+-`Nme`bB-m?;!6>>+Ni+wEk}5Fn2$wtMPUv$BcCoD&{HM_pVivd#(}n
z*3f`C#)ylndLf(oua75MzrB+Az*GM67VEr8dV91Fm=&;;c$81+Ue@>Gj+k_Z@BHI)
zj+-*e_J&^ao*B0<Y-!%SFCwx}eg$mX`zq5;f7`X93Y(8RzJ2+}vtjb(g7z<smlUhn
zS1G;JyP{ajP<!&>MqQcnmcMrgc#HgqJLfr9PcJm!Yf|44H+#9~62FueW%bBPm>%Qn
zkxFKF>)pt__}Gocz~navRy?#WVEZ#6fA1@%n(4a|TlOzzkhA4e`BdA|z3b<V1FZAZ
zR(y|~+0i>$NX~u9`^R$U58gd|y<z>1`NFH0`0reOz%J1-_Wwm8p(l66!CqK%+*JIU
zVC~-*9=;Eg%uA29+D$svDrITYw5-6TEZ1buChG%YFO&DY$nUxK`tg1bzt`IvcC(u0
zMjD)&*K_%jv3H96&u@kMTz*Z~cgd?_kXt%&=c1#x4!E8ZikYIPnNjVrYjVqp%>Lt+
zMy(Q0WI8y1FP9dr5kGlTBgTNu_JokW{$$Rn(izqNp8Gx8&-Z^X^S5(J&iDV#RSn6@
z;JdN=@@bi**Fo2Lrkvh;`wFjgUwz|m!$KY#b!j&KsnQ(#8MEW=8)Q5_eFd1$R7+eV
zN>UO_QmvAUQh^kMk%6I!u7R1Zfn|uHp_Pe|l_`*GZe?JQ`g-wP6b-rgDVb@NPz|QK
a#)csVC>prZc9;S+FnGH9xvX<aXaWF272}}*

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

literal 1335
zcmV-71<3k|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#*bF000Cm
zNkl<ZXx{CaOOI7W5XXOa9t?<sB)m4rTM}eok8$mey&(_-Yxx9(L^L6|keviS02mA*
ztXc68`~ncc8Ib1&aKa3O4%|Dmi>}J4={b+Sr_UKAv69Z|bGo~#{#Di8)qUVSr_Lhs
zcJCVOf0EkrKnM8H@OQur?|~Oo;ZfkRC_N+f(V$NwG}I!HQDC{e&o!;M(m+c9V1Bri
zg-$00TwMSI5rR7f^`gGDbg46F0C)=wM}Vjz9X}*I`_`x50fQoF18^1i4j&$M4dH;}
zz-3^)@E%MsNTu=sJAgk$xC4&Jck7K6z?A7TCEvn+M@^r5!rRJfjMTzgM34jCNO8c|
zf#5O#+UIZ%pS!^3KxQ(jwUz=mL{Jy#N&Nz_F%Vh?K>KV4E=qgPfVd8f1hSJzEvE5q
zl|NMgHa3I+elj4sQa={Ru1#vKG2oQ};DBFDAMF<lARKo-;5`HE40K4c{wcC}b-)C$
zHb+1|0PNUx`1rRneoXa(3R(j^Cv&p{4ocfl!I)S8mdBw$##3Nb!I&sg#`~D>-rM*I
zoyWKi0Db=e7!PE9S>=VY_|p7kk34(wya>z+z$VgTC%pa^-d5IURfCHFbnqD@z;1b}
zM}7+cHbKhkdLV0;JPWhgsu@0l-{O_&8{qdA0o)cD3gBb1Jt3E>01T7GF2Z~=5<qM^
zZQK768A>ZehuQ%0`n-)81O27bMZ7EZtLo4Lrp@~>aZ8&6Ug9^uS5mJ!)F8Z<nD5hM
z6FQfwj+C>&BVZGLB8}iP#_<9Gs^pCH3lH_SPac3B0-z_lJro@ZsmKG4Z0)@%&#pXm
zS&i|)w3Jv6=(4F+SJ{KqSTxi-`&qb=#bk?}pj0Wp6u1+}+85~37nP+F`%@Sf80sq)
zrV^_o3{^@RMw;?!qV<OWgS2c>$F3zyBUFZ_>PabeSvq~z2&j7|R^`sIFrEIi0Rzpm
zfIZO6N&N?D)0>4DSBHI13a>c>;M+iU5~-jOe6FHyRuE^HpJ@&n1#KCUHs$vb@Uu}~
zL+4kry`Zt%JaywX;JyK&6K(=OvCHxnYls762N-)Ez6Wd#WHv_X&N1KtSvYm^DS*Q-
zgC~H!qR2`qTjksL_yxep7#;7#FgpWTjgvCogm<;N|23I6w9MiUGE-8wZ9N&IVR!|9
zS=OrZO6uBWz&B*~{_2r`j8$Dhn|f>-f4Q|R;N3deC2%`_pO_>I4OdXKZ4x*Qd}6F#
zOZn7`S-t3W_|51G;B$N|ugAx~16}}6fLp*d;1cjGhsUA<P|~aRIrFW9Uv2a-(#6NT
zRZ<hQ*z-l}WY_v4vU@~hLfZsnsg)mmDcNMIg8%<V&a*;4<I4U6r?$5axa>c0YI|Qs
ztvd&*{sX7BM^nnyU3GDl+TJ>Vs*9`C_9*%nWRrKJ49?+P0000bbVXQnWMOn=I%9HW
zVRU5xGB7bTEig7MFga8)F*-CcIyEvaFgH3dFzpO2qyPW_C3HntbYx+4WjbwdWNBu3
t05UK!G%YYSEi*AxFflqaHaashEigAaFffk^F>wF@002ovPDHLkV1j_iKbrsm

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

literal 1495
zcmV;|1t|K7P)<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#*bF000Ec
zNkl<ZXx{CaO=w+36vuzB&1)Jp5i3zEE?g*D1g#21g+g1Z2oX1;A`-=gAK=GE6c;W8
z!Hq>Mh|7T5LKp2u@B=M&A!0#vSFE*Eqph|o_N6MdN&23PnLl&xWbV6n@~&wYIdDmG
z&z*D5|9s7v2`tkx4MeR0`2f8P8CBmlN-G-vPTvk?uIWov9v%i(llEK-_!l@+A%DcL
zKLd0l-b&ys4M#@anE<ANQ$PopF;B<8p9b!U)>+4l0*8TPz<yu{@GNj$0!Sky#lyfM
z?-_Y0e)Rr3U{$nUKgT@ap7*}i&H|qS4+3rDfI2l-3&0p~(iqxJJOVHStf>KDj*xN|
z&^N$cO@Ywj3xVSa&)G-s{|2rs0Wb>u3d~1xx*o{9dAA)`Zvrw9fMMW!`lpZ#ngebs
zQQQJ91Fi+O0?z}V`Zbb0XMpSj#s>jmJ-ELDfCX`{UsqL(l7AyGMM$T4TwU~luRZ92
zLF_TY%K*reFZne?edM-rDPr^d4&Ym(NAmU&(kZ(pWW=_}$kZcnyGxX{aP`!V-nEUM
zHNeLS5Zf0U1qpt<Mg){XzftT&0&)>>1ULxn1SUNo875t;fsc$nrLDSC);=M`w;1Eg
zI+5jVHOf+LR7M>J?n{6e2M!SSi5~DJ3p-mS>B9?vpDF;zsDFTU#wZKml>g>5#df+a
z0b)}^_5*`N;T_8Bz;0$wMC<H6aGau1b4K3lW}OUtmoPi^fKPG^7s(@&kvCGtKN%Sx
zM{_N(5qJx?=}Df_^M3!W3f-ozfUN7IBT4e$IPeF>H0qk)pNariMRWsh0JKp(fSXvY
z-n~&2p024UsdS2T8r3yk)22LpyOAYNPkNqu|BHmW>3JKnA^;&LHyNX)_%+XK=Lj_4
zza1I4BjVo~>HC63bR$a&soLA#MGBKswot6CgM^VB;2PZID#uN;FwL?QP8fw!`k3eC
z<fW8fj+;{d!nNQZ2pb%@P4O4QKVtaV5zvAUDTehZaJA><Zuc!*iyiaNXk=IwKZ|7C
zZN_;0+~awT9SL)(j^dvG?q^&cZX~qP8*sV$IWCpDHROp}(UZ&1B0FAuMTmknv<c78
z>eF6sBWK|{WQV*C#XjD_MJ5Ntip1YTxM&MhBi^^9lzW(kBf$yWCIzma_fst6ufQEg
zN9a$DU4&T>FB76*BXPIqm)*eG$@7F?_am?icmbD=>w&9)OK|7&#z}^~kpM9ZJm>lG
zrIn1|Oi07js6LPD|NSn{1|plAZ$==r(d{JMFxXjWGvSb<^Ffy|W?Ml0F3%bPA&<Ob
z6xwT&qrgKHM~L`@R(8s>Bl}6*hSn$m36pV;5a#{Zn;+oL*uU2>K6PB};CAE20mLBI
z6ZQ$+^;lzdO<Biy3t;B|ihw177y(`-jLK&{kobD>yaNEPCR7(U6Rt{ROfHBe2OtHu
zb#B33rQ1}}1(rRYp0gS#BO48HyYv+BXJnkM7u$-Lqzly{d(j2%;`UMCJ={U2Uq=$}
z5Mf6y09Z;iD+!(#4dX`gTY>9w2c)&YrNG6whA;y>1H6xmXklbu@^BDpMERfMuOdvQ
zv$!)ysjzcN8c9?uW&g2U;Q8|fKwX=9*;1Bind;GhZA~{wRe)!~0000bbVXQnWMOn=
zI%9HWVRU5xGB7bTEig7MFga8)F*-CdIx{#eFgH3dFk~daZU6uPC3HntbYx+4Wjbwd
xWNBu305UK!G%YYSEi*AxFflqaG&(XiEigAaFfg+j#lZjo002ovPDHLkV1f!phaUg{

diff --git a/res/drawable-xxhdpi/ic_power_system.png b/res/drawable-xxhdpi/ic_power_system.png
deleted file mode 100644
index 8d4979f7c2210f08368e343f23f23b01ea1a6c13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1448
zcmah}do<Gv9RI1!`%zs*HESNT^%xs@YzeC|Ye`-w6eEuj4tb`?Oml2?8KM}qQV5aB
zn3bj^kG!s-m2gWTuad`#uDkBJ|8&kh=brERen02)`JB)Bp7Z_V%RGLJsHVI_82|t^
zk^{j-h7LblQC>FPXKRTv08#OdcmSx$R9W)_%eY*$3-J(8)eV`F5tzS&iz5J>Hv|CM
zB>?y?lW3Cw5Q_$YPrd+vyAA+ak%f)URx(5WG?_>M)_)fFacPcBQHpf%jF#a)I|2Ll
zP;1$`A`$`bcJB3TA-Mu#r}-lJV9u(xp3loJ`z{j)x{5b**VA0W7ZuPc>iu+keGHQu
zfRac>nSQtX?iSc8;(5oJDgwozkGTB&IOmDp*y*_VrQ+|$EX2E5Q^X?N#F`N5U0Sa2
zR4;4M2o1L8Rl#*8Ni_29=_2*T7&>Z<0?S=weh{}|q3%ehukb+ulv1;}rr&r$Es4I1
z)whZ@2#=KR&ZIe>jU;Cfv4IgD6DJ@#TH9^ac)tq`(|X2N%A?m+KW~fFX#iV+prrH2
zp(^qX(~OJ?Y~X~XmpthTk-M2=CKo$yHn!KdM{pu<nPzOaTo65P$_pC05OpfsoYpCV
zc%&bW?i3(ITRgVjxjRnMkuV?>!%$wTE)kPAIzbb@dyu_I=&l&#=Guu5b<c0;!8OWn
zob{yu7atZrOy(HWUwI=6AyVi4a-xY4Pd@A}G9>>As|wG)lhmvp=?alnZ;Wy&o#BZ3
zRk_B0AkL*$R!^}C#eH8G{)gweX+^~io?YmE`t~IzGRNJ!dL`E&Ndv3C=3?8cX(@Mf
zJl-o6a<lT&ch9g%Z`c0aqBjsow>Kiz5^4c!LsUFlPiT+dcgbJ3{Ip){LGUBpi4gpV
z&Qa8>5bg^Ehc#z`sS74Koyp2xGYNWE7SSBLnq{7J{LEC*24gJ0F3t$#^ZaE?=Z#_W
zl5JrY$Wa6*eUABR3rJVd%M--dQ+wa0+LB*q^Z?Z=^2GX3g(uz`r!Ali@TCy_A-RDc
zRw?#1Fb11pM-7F+HT*XmTw^<3;6aU)&l+fSs<ZdbjIFYJ+pe`lJ5i+j)2lXHuUIb%
z<p-9YliA9JAS2%q_RZ#&v?pL|@L&7|N19FW^2L7eGDc^qGR4?uk}z-Z`L}No_v=%<
zFOMm`ZA~g@VH)PyxF_8cBSK3wEFm^NS>W!`+5kf_Co!(51QNC&^Q?lyftB{4wz)#8
z(y%_~`AR;wu?b@9tZ`Abb_b@UVZz3)VWrHduj3j|x7*^XMo3x2OeeeWl!_i6N}yY%
zgAz6=Ex@*n;|<zU9oPz4Fpd8)kos-)^(9Lq9DRa6g{9~PBxlb;>uw2;BwtHRBJQOu
zC>}wpgpK;<9hsrWT1;t63&O&MJ!S97A9CHjtA3=cF$DA2M~lNljAyteHy_V|D+qKa
z|A|~?ih^i0>TUN>JpGf@WjkL~f*jr_Sl24)i2D-gH1JS!Co~}p_4NbLVPA8#@^u&H
zB<bT|op?`T#y1-L)nI*^HdD=F-^podl%j5v*cJY|wTE@fi&I`XI`5BbXXF;N&G|Lu
zJa*u2=3myicQT+ZcxP=*dDx0XwN?@`Di|TeF(f-RRdwU3NC`islf}!#xZePHakZbe
z;uGZE!=JvV@$l)+ErRR+ainJFO=3e6!E#y95U7s%aY?US0>{Vd=a68MW?SkvVL)=s
z?KkU7(gO>{3E=?>V6#LmskZ3>ieEu1yyK^o`e(9Uj;i#i6__piTJRV<kC*_zm_VF=
zRG<t16EtQ&3T=);W8E+q+<p_BnT%TC(CEPF;-X&y;Sm8LK?(l`%uuEnH}o$7<)8*L
PSpXo}9V1j7@}>U`$s~b_

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

literal 1889
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
bGcqkOH##sdj|nkx00000NkvXXu0mjf!M=0#

diff --git a/res/drawable-xxhdpi/ic_settings_voice_calls.png b/res/drawable-xxhdpi/ic_settings_voice_calls.png
deleted file mode 100644
index 78e448369d113f1fc97b4b4218fa9e64a0e2bf4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

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

literal 835
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgSkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XotE
zPZ!6Kid%1I`DP0{%CyhF;_Q2L8#{l~tnM54biQ(D92C#`z#7k|)KSMGxO8jNQSbdu
z2l*GUv%ZbAZ)j>4%QDqmG~=_AO6FuPS$*GGDdn3tTU&1y{I`E+YI^(go7->xDObo$
z(+GZKvuvlsOrhrm^X_Yi@ajqT1}$lH`gnP-18eG<3x~r06zLaqE?aoWuCBQ|Wx{Gj
zE@hF(lvW{88yl@D5s4F(emeY73qPT8{pQOcivzj$HgEktd;itS<GO9TK9uipYukD9
z{<cFxvlqUYyY@^F`#)Zzb2-v#b=d}|8B!EC9=PmyVE_5Dq{iHLslESO?jHHUbyTl^
z(~<e+P5E1QuKDm@O78F9%?0Y*e~j6#@B1G&qpWv+y0U3aYtr1r?M(VXN5eJd?LML(
z@SSms5UbR+^~X5Nne>wzUVe`*Yppl=@bq9zLbvkA#5SR`dk;^O<Ke$Er%`|9{R3;i
zon-y@amupw4>aG-`0Jg~HfL+|<i~4j8Fv>y+fv(jIgEAL8*ULD|B2UFkFDkExh*cS
zRm-5wMafffu}v~Be}AZ$#htCbk$JmhYK>0zuTwOidBSCZy?ch+k7v?fwAtr!yA-xO
zD}1nlAH+IRbNm0B7=^CIf0=I2mTG6(lJz#)BeJgHiHW5XYsirU>sS_9@ca|z4{>o|
z!HE(KSY9>$%{q6|#PSc*edh8z1$qlkJ`}Hz-SJraIa8<Qzu*2o1{XK0mCOy6jlNs^
z<n{TB=9SMP7kf5`KC4<2TbK6s_{Ql!R<B<bHoZFJ@w)I%d;Xd&Rj=zd{4betWOLci
zieKS7J-PNg^ndjs^j?vXUC&Q0m$U0TZ~c7|>w)5`p!N4}tTLa;{o>k0ovX9Yu$H_w
zZw|`uigou|crMv`*H`IgtNyncSMrm-c2BI|KULZ>y?$*WFl94%y85}Sb4q9e0NfRG
Ac>n+a

diff --git a/res/drawable-xxxhdpi/ic_settings_phone_idle.png b/res/drawable-xxxhdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 4851676ebbf88573e638c5a02bff943530d38b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1169
zcmV;C1aA9@P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002
zVoOIv0RM-N%)bBt1P)0=K~#9!?VHO>RY4rbzg{)pUat=<MQUR~E{qUK@)1&2WGw<0
z{Q)gnL}kiVdP$40P|T1>p~Bkct}bP(NLo~4CH63Ss_E6_Y6S^CPKzvbX6`-bo|)gh
zN%Ni6;F;g=_i;QkznR|=(9+V<()ynjL1x(qjVH%Sp8*Y^0W^RH&;Vfrh*cIvY&g)1
zFocGHJMr@7UyT^TmQaW9#w-jN0T8SLG{S&^85{{^_!pK0=9U7eTk^!YP`x!BOlS?Z
z0UDWSt`H`df7Qx`CY}XzfI5MtX6o>d37i@*P#HA9UO$!&Q-;3>^8%M6g7B@(Ko!OX
z*5<LBD*UzhDscE1Yiz#*S$HC_IF1||fcpYxU5Jrdh2n8XVD%nF`1=KpZex}7J`e+s
z!16xT;X5(PIq3<Q0$AUP<M4=k`U{+D0r(~F6EaN>^;Q9ZEDUqc*QyLZ4qnFm0=Ajn
zN>~Q~%CW#aKc+IpJH&-^*}}C-FaSV1H{zf=fR~KvDY%paq~RMg;<>8uH*vw7wsf%-
z8~|{Z8<VF7;0$AS8mS}z>G;8nIiUuipUW9R0svfP#ynFIekK=6IT^rCZd8Um0Bdv<
zkz@c-+;Y8L{!qV}=|99gS++Ze9ux020P>lBFX?%sms<g)0oF17K2m@_E`^r{NMZUz
zqyV3pzDqrTj}*XX;@yU3n03Kwie+aN0^*oaKjmkDePV%h23YG6@&MnNej+JAvWa&E
z04`DhmwJE+rk_g+kZa=I2EZWG-(WG62&P#RYyFKpz-y+zm2?J*O}yIxc**q32rpnA
zC^hkJLmAw0yNC>+gu7-;Q<I-8H`_r5z#eFxsxjNdnDrrvBzz~P8Bgcc7|!R?f;tj_
zQ=FfTs!aED7k^0vzke^qiTJmUa=)7v<p6DzrH(|dGBBrjEh^zkCtk#>biiNk4kKNe
z_0<^T?ANIN3+1oZJ&00bI~v`BvX%0;?0}#Qab3Z#9Dy4G%T*N1T(`i{HOX0sMyJ54
zhi0G57FHEK66e-b+!a_H^HVldpk2Z;>pK+KvQ~(X!ZPa)%5?XnusA)7<{)3XWL#YQ
zT!d})AXb~73i~K(EkY#2&F#8>S}Vxqz)e5S4fxQG;s9riNR*%hQ+~&HhUN=02QK*y
z!GM8D+(I=fkh3@=NytG3j-v~c0mrq3@&mYf;p=R_&8aP`T2U!Rl!gBRg$RSPg{ye*
z&4Vn2O_g{r75poU1uH@&z>Nu8!Fy4oHf5GMFVt|w@W5>V)kwfUrUEphpSy%%zp;3M
zCiBWyFv+ZHWugpuSdUz!BLz+XQ<%mC-eM2~cz|(eX=!O`X=!O`g*}-w`+s5CpIg3R
jSmDwD8bAYRfbi-URRneJBdE?E00000NkvXXu0mjfLY4u2

diff --git a/res/drawable-xxxhdpi/ic_settings_voice_calls.png b/res/drawable-xxxhdpi/ic_settings_voice_calls.png
deleted file mode 100644
index 633cfc1b914160fca5c5eaae97f0e903e1ef4fa2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1314
zcmV+-1>O3IP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002
zVoOIv0RM-N%)bBt1fNMnK~#9!?VE3CR#hCwKYP|}S@XXr&W&=Z%w8y>;Tnk*By123
z+`t#3^o3g`L|bJ9zS8!*2u2npNI?muZO*J2iT3A(!U_{p(San@(m9+y&S1KFrq>q_
z8lH3RpL5Q=PtS$>y)W<Y{?707+;h+Q{mwZLBubPhQKCeN5+zcpl06LLcwEEuQ03z#
z!!YOQ=Nmd{rH1?R6@CR*JcGY;U16@LAJKk<y|gkjdVrol;X62VX#wP}f9a)(2~h(4
z9T;H503de_u#wWJ0B!~ba6J39-?M{kAQc6`bq#>Y761+ozfv1Mz=#IGY)b%#ao!1g
zd>YaKsImrda5(HUo@wfgM$=Dv_?b#M^Ld6AI{AsL&%9C-9>8G@fabtn%V?mNaaT{H
z)P)7GPXl1HrtfmnTy>ox)`kP{p$5RG2L30pnNb&n`Y-_A&;U4X*v7;3x^$!vhSf$5
zfSXJ*Y^8`c<%fNl3R{4s8UPMYTeP&2%L<Q2Z0CgsJjM$7>ac37nm<GL3G{0Kobsp#
zGMr!+Z7lQ1dFCn*##w3y@P$?<nipUu9-xCcu5Ur^NPTu`UYiy`OTbj(2AwX+-%7>j
zyxs<2g%-dTja=v=&ns=;lq~<^esh2c+=$=}+_|<<tQb@eNp`I^@8J8u;a_Ejb~f6r
zC@B~4k6`sXCFTI_0mC2TS)+8iOYs)clGPe>fJFhruQRR(Iu+@+SW10u(}{kw3?F7t
z&1$xDQTg;O8l)$-2sT+}nFDlKhX0>Rc!>)N4?|25EN4l>>C5H-i+#e^OMJ`tDo{7t
zFIe>0bfVLtg%6P8eaX*tX;EOUl$)l)pO423%Z`-v`#NkDY^F)8QcKJMW=bQoP51zl
zr4^3>=@&jGSiBH!Qa5H<^t~c^d|a@2Pq?2BHzztqkrhA*gM!CRf<=pPe{a}JEKQcR
z#&#*KxL2!$`^W8?drks4XOkrY^@6{X!u@$tdzR{x5H?x)TPUr`iSxJjeQniA02$9E
zUH?@faag!lr9Sr!bVNe<l2~bpV#{M)ybwNCY%W#C37}lD>G5qe+e1-ly&|bd$EzD1
zP?RKV;so#r*AxS4Rh$r-72T-cbxoom^|=D!C}r^hDCHLgLLU#t2jNlW4%a@*1TU{z
zt=v~R#6y~Xo}iJMXb*k3X@jy-{+a24Jxsm3bUDgF-lCR?`9(;(Z1`0M3}60|vK(gz
zZ_~^w7BVO5fuV>UN`y;1WfZ>osW4*|vs>9{miCas4|Xcdsyy#<X>_;iAspTC{ZEBi
zzJ;AGjh<I7zL<pXcPh+MDL!y*cqh|B2;aepdPHh-J)$<mi+5`V^YESM2h|3TV}eJi
zwG7|M$GlMOaY*VGyR5=@@-wxS@tIYS|2sggD-FjR04fxPXRH7K8o3m20GQ23TBm;t
z4gg>=2jdL@u!8U64FFKj5Ag=bEe?O8b^4{?005@*I%neykkfMB<&Q#2r_J;jud+Yz
z|3vl_>her6%Xp1$&U(%n8Ri%MO4CG^(?mPl=;lXGGDwCj4%ebA>JueOlqgZ6M2X_9
Y+b+wHy18-cZ2$lO07*qoM6N<$f{Mmhi~s-t

diff --git a/res/drawable/ic_power_system.xml b/res/drawable/ic_power_system.xml
new file mode 100644
index 00000000000..3b84f592221
--- /dev/null
+++ b/res/drawable/ic_power_system.xml
@@ -0,0 +1,26 @@
+<!--
+    Copyright (C) 2019 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+</vector>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5359a2d4568..2b24a4c44f9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5763,9 +5763,6 @@
     <!-- Menu label for refreshing with latest usage numbers -->
     <string name="menu_stats_refresh">Refresh</string>
 
-    <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
-    <!-- Label for kernel threads in battery usage -->
-    <string name="process_kernel_label">Android OS</string>
     <!-- Label for mediaserver process in battery usage -->
     <string name="process_mediaserver_label">Mediaserver</string>
     <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->