From 7232e4f7ee367c22eb8a1a6e8e5a984480af045c Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Tue, 24 May 2016 18:07:48 -0700 Subject: [PATCH] More theming fixes. Updated the importance seekbar to use colorAccent instead of a hardcoded color. Refactored the various gear icons to all use ic_settings (a rename of ic_bt_config). Deleted the png version (ic_sysbar_quicksettings). Cleaned up the add icon. Now there are two vector drawables (one white, one tinted with the accent color). Deleted the existing pngs and updated the usages to use one of the two vector drawables. Deleted the theme attr for ic_menu_add that had no usages. BUG: 28760785 Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3 --- res/drawable-hdpi/ic_menu_add_dark.png | Bin 147 -> 0 bytes res/drawable-hdpi/ic_menu_add_light.png | Bin 660 -> 0 bytes res/drawable-hdpi/ic_menu_add_white.png | Bin 585 -> 0 bytes res/drawable-hdpi/ic_sysbar_quicksettings.png | Bin 824 -> 0 bytes res/drawable-mdpi/ic_menu_add_dark.png | Bin 111 -> 0 bytes res/drawable-mdpi/ic_menu_add_light.png | Bin 595 -> 0 bytes res/drawable-mdpi/ic_menu_add_white.png | Bin 553 -> 0 bytes res/drawable-mdpi/ic_sysbar_quicksettings.png | Bin 578 -> 0 bytes res/drawable-xhdpi/ic_menu_add_dark.png | Bin 115 -> 0 bytes res/drawable-xhdpi/ic_menu_add_light.png | Bin 738 -> 0 bytes res/drawable-xhdpi/ic_menu_add_white.png | Bin 655 -> 0 bytes .../ic_sysbar_quicksettings.png | Bin 1000 -> 0 bytes res/drawable-xxhdpi/ic_menu_add_dark.png | Bin 115 -> 0 bytes res/drawable-xxhdpi/ic_menu_add_light.png | Bin 1232 -> 0 bytes res/drawable-xxhdpi/ic_menu_add_white.png | Bin 680 -> 0 bytes .../ic_sysbar_quicksettings.png | Bin 1363 -> 0 bytes res/drawable-xxxhdpi/ic_menu_add_dark.png | Bin 121 -> 0 bytes res/drawable-xxxhdpi/ic_menu_add_white.png | Bin 1191 -> 0 bytes .../ic_sysbar_quicksettings.png | Bin 1761 -> 0 bytes res/drawable/ic_menu_add.xml | 13 +++++++-- res/drawable/ic_menu_add_white.xml | 26 ++++++++++++++++++ .../{ic_bt_config.xml => ic_settings.xml} | 2 +- res/layout/dream_info_row.xml | 2 +- res/layout/preference_app_restrictions.xml | 2 +- res/layout/preference_bluetooth.xml | 2 +- res/layout/preference_tts_engine.xml | 2 +- res/layout/preference_widget_settings.xml | 2 +- ...stricted_preference_user_delete_widget.xml | 2 +- res/layout/wifi_display_preference.xml | 2 +- res/values/colors.xml | 1 - res/values/themes.xml | 4 --- res/xml/user_settings.xml | 2 +- .../settings/UserDictionarySettings.java | 2 +- .../settings/accounts/AccountSettings.java | 2 +- .../ImportanceSeekBarPreference.java | 8 ++++-- 35 files changed, 53 insertions(+), 21 deletions(-) delete mode 100644 res/drawable-hdpi/ic_menu_add_dark.png delete mode 100644 res/drawable-hdpi/ic_menu_add_light.png delete mode 100644 res/drawable-hdpi/ic_menu_add_white.png delete mode 100644 res/drawable-hdpi/ic_sysbar_quicksettings.png delete mode 100644 res/drawable-mdpi/ic_menu_add_dark.png delete mode 100644 res/drawable-mdpi/ic_menu_add_light.png delete mode 100644 res/drawable-mdpi/ic_menu_add_white.png delete mode 100644 res/drawable-mdpi/ic_sysbar_quicksettings.png delete mode 100644 res/drawable-xhdpi/ic_menu_add_dark.png delete mode 100644 res/drawable-xhdpi/ic_menu_add_light.png delete mode 100644 res/drawable-xhdpi/ic_menu_add_white.png delete mode 100644 res/drawable-xhdpi/ic_sysbar_quicksettings.png delete mode 100644 res/drawable-xxhdpi/ic_menu_add_dark.png delete mode 100644 res/drawable-xxhdpi/ic_menu_add_light.png delete mode 100644 res/drawable-xxhdpi/ic_menu_add_white.png delete mode 100644 res/drawable-xxhdpi/ic_sysbar_quicksettings.png delete mode 100644 res/drawable-xxxhdpi/ic_menu_add_dark.png delete mode 100644 res/drawable-xxxhdpi/ic_menu_add_white.png delete mode 100644 res/drawable-xxxhdpi/ic_sysbar_quicksettings.png create mode 100644 res/drawable/ic_menu_add_white.xml rename res/drawable/{ic_bt_config.xml => ic_settings.xml} (99%) diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png deleted file mode 100644 index 40a26b123f5840cd944ecb0db643a5bd817f0766..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|l3?zm1T2})p{s5m4SB9zW$S8Tg*bJZ)OG%Jl zFoQ$Gf#i1^7XtbEo-U3d8t0P}Bzzn^1f4yOW?tYl)M9MxH0}^-;4<8Kpphw0QAdh> gwS1xLaR(-b!{+?m$2lHe0BU9MboFyt=akR{07MTcy#N3J diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png deleted file mode 100644 index 91b035402ac307cb3b4930e0e8d29c06b1b03f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 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?XPJD~9?o-U3d8Ta1Kbo4r6Akwzqr}btPM|i4> zVg>v82TuKJyFT#5DJf`d{v?p+K4WF~9*1Rf`PgQsHN9^>q-bHa48fk(peZ8$hZ`aR>mDT;MMcvr-)R-?bp(e)K1Mm^rA9JLE)FP zdaH_{=#JN-3>!+%sXn(kb|B^JpPKISNt$VAJm!lQ=;r4CFg|E>=868xCFf^N{Cq^w zeAj{Ve^d+lw;$onlz0%W*P#7CZDYlfzTyXwEG@Ubb*-J{T&}R@dijHimm{4DbE}(u zySAFWaoT=huE~Ce^$x~go!8ucF_Cjds`T1_ieV^jbU3&D@(&+w5X0Dds;@2MMPExFyK{7Tq8Xk*|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_88EW4Dvpc0l7LJzX3_A`ZWu?wH49$m2Sn`OP!Gxv57x zcO^%Eby#uw<=j=Pv{c_M>f7MNV3;VdrE;~#yc_l#lT#O5{E>X(M(e6sZHzN+R&cv8 zOuV=*zk8N2SD6(5fyKW2nerV3CR!YOzbDDqSojLFzuEW9rb%yeoLU!zxY!k($q5%# zVU<_h92 z)qp`?#{cG|*jsGgp2zFnE}g;~*>gI; zEM0y3@8voX>E4w;88>R(nbV^(eK|0+R7+eVN>UO_QmvAUQh^kMk%6I!u7QQFk$H%r zp_QSfm64IIfw`4|!PBlCA5k>q=BH$)RpQn#|k3?#4J%UH$0z-STR6XMD+wS5$k5dxy;lcxfM zGQA|oFPLF={iE$X|Lz<7anU8F{8!%! z%lR-_1>V)%I{p8T6+3~^=Hcn$7-Dhy=#=o_LkU6~SX^5dY;<)I2^4%I zTAly<|Nq9xdv$JFoZP!f-~9Jo^Wy4i*T7klx($Mpyw*BpO}2cyYJyct(DH%>t8eFT zTW+4iU)#s>w@ge@;)!1gN1MCbR>L9(+4&ce3TOBjWS*Mm@#=t5>r>y|=X|7?lFHuI zm;XtcH^*n%#Vv_TB4#bVB|c+QhE~_kBU@74qasx|rEzYWr@kq$pnSV#z{CU7PJGS1 zw?b&s9?zeCe2ynC7jn;h*ksfc+rOnf=RT__%QSbZ5Ao|x&7JiwzT(@54v&WxJ6N9z zyIV~)ovinArd*9qf#2)aCjK9b0=HL6K2ceJ=Wgud+%G!C&0DWWatm!2=+7+wo^^Po zjg8p+2R~cQUwze0;twr)^}g)a#E;b`iM#6NZ)*Sk)Z@O<%i}jgLe#GE^xR+eFRDI^ X@z5hp7O@;)G%|R)`njxgN@xNAP&ipR diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png deleted file mode 100644 index d7aa7742c8bd799152cabd7261ed8fb13b923806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaT3?y&uT)!Jgu?6^qxH3#_2cpeSzkdXZFqQ=Q z1v5B2yO9RuhNS%G}U;vjb? zhIQv;UV>C6dj$D1FjT2AFf_CjA5L~c#`DCC7XMsm#F_88EW4Dvpc0l8mJzX3_A`ZWu9=oo|K%jMhlT?1pIh&ng z-ybz=e>{3;>7C_z$7lRtw%amwXUmiT9@B}FC-6-cJLhxWhjE{5+6yMZi`!e}S3lTr z?O9*uE*_o6x!e5@=&CXwU2yZi=kx>D;#0F6x>=YQO$)-xgpLUqm`KXVR63jz+aqe+ z_=Y7;Ddg*2b&clWy_r85d{zgSEo@sBzlUQ5n~<*N*QQ;60~Tz%#;0|19gj|DelMfk z0k5B7_rkk8dK_F=C%>`__`zu%Q*M2E{lu;E{I;L95}5xmx_@2AFQj;OVii-Ja`qvy zKPygrKfqe9_9eGb&f2x2+fZy`0PE7C_`kb;Tf6*-O`Q?j0&>T(x=Ep@=FMq1xb=F1 zzng-~?*m`ICG?+iF*~zA?dC_8SC-MvcjcEd0>e$U#5JNMC9x#cD!C{XNHG{07#iyu zSm+v=hZve!nOa&I8R;6BTNxPm{`{Pcq9HdwB{QuOU4xkwP%~JA_Aif2paw~h4Z-|F$*q{Ia diff --git a/res/drawable-mdpi/ic_menu_add_white.png b/res/drawable-mdpi/ic_menu_add_white.png deleted file mode 100644 index 40cdc820a7cc293916fd6baadb3a0c6f182b55a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 553 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&#(1r>Bc!h{y4(QyudTIqJDY8p-ZfDLP0@O@S*6P=WLenu zu-D#SB+=tA$=#^lx}bqsaQ7L}4EK!;*ABRQyy4!<`uF%^2CoG6 zH4X38>YH<>?cNgekz<$J78bLE-#BYp&%N){*qXvvnpD#29mec#-xWQ{`|^$dC9||X zeP5pGe{$c=BCd|Mrf?4Sa+6=Bwjs;@r}XKme~+wryQq#E6t1czt`Q|Ei6yC4$wjF^ ziowXh&_vh3Lf6PV#L&>n(9+7tNY}vJ%D~`h*N%@U8glbfGSez?YnXDK0T^Qpk{}y` r^V3So6N^$A98>a>QWZRN6Vp?JQWH}u3s0tkqKv`Q)z4*}Q$iB}xoyB; diff --git a/res/drawable-mdpi/ic_sysbar_quicksettings.png b/res/drawable-mdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index d266b39288dc31121b8e0991d6fcf94a29ff09be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA-45^xab=j=K3vfrw>L6CZ+esj z`2{nS$F1(WxRq(|1~<_;zrWXV`)=ODnD{G-|K-!hyEE@q1b(S!RsMY9S^ zW)!Pmy=m_Lp_1)Rbk(*^J{I$iZF$zSKd9#WAMaA2nddxR978nDFP-$9ugO86g@3nF z)7~WJ>i2ui@BQz*v)9_>(ceqH9%;|K%ciqB)#;yXD&lOAZggkZ!%-tY(O!V(WFo7h z%hg32E1H^BR7{R}9h{t2sg`Z2wLEab^KA=WyXtw1Owqm)!s~QKYU)>k*H<%|G^I4o zik;fFH;g@I`bmQm_pd2bz*tNv(7_AXW#Wy=IPqcxzD9u z%Ra0B(duLyzkg17wQuhRwNDQ#jO_Aij{Q;kAs5bK&bUK-fn5C`Y5zqNtxK0j9NPf& O8H1;*pUXO@geCx^&g^yo diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png deleted file mode 100644 index 2f00b962ad79b683d78ae307200da2ce3688a3eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-iYymzYt_)M#foSv7?;n98j3q&S z!3+-1ZlnP@(w;7kArhC96BY<1*g2G*`uG38{SJ+&8}7Ue3|T_*x}WsRSb@qIJYD@< J);T3K0RWV2AsPSx diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png deleted file mode 100644 index 4109b2ca666653608263cb8acb9f2e86cfddac3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 738 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&)Rwn><|{Ln>~)oqg7?*+ImO|H?I2;n&qK z`i=*E&x_glk+o*c%^#oTPOa0r!fKr8vm!wD$E*VXOH(FI`+fE#kBT@~TcX6Vnv)`~ z-HRAbEdFJ^pzNIQyr(XT2ZFh?PqRKbkQ(xzyCTpdkTZfI{J^pLI`(zXRTOxto^SUK zm@r zH`zN@r8(FZ+<(FIlH=);_cwH`zs+Tu-}yS^OUGYdhj;Zgj+YPUc$z00CCIi$Gk@P= zd+2`G+^6&M>u3*K!HKG$Lq@Qiu+qE9o!YvZ@9KG5*Kh9SRaGs~msWYx^+ z4k!MlGd@&Uf53N9LZj;0S^SsxvAmObt|HM7G+<-LmFX+iJYfR^1Rr!joGA9{e=WePKNxnX(nk?n6zfi7W?@4 z)1=4+LIKSFi*C6qGFbgHT0AXLqAl@EZ~m7GU+tY!LT>@1QMJT1q9i4;B-JXpC>2OC z7#SEE>l#?-8kvU}npv4zS{WJX8kk!d82JADoQnH5koScCR2k4&Hj vNstY}`DrEPiAAXljw$&`sS2LCiRr09sfj6-g(p)%X^p|t)z4*}Q$iB}{O=bK diff --git a/res/drawable-xhdpi/ic_menu_add_white.png b/res/drawable-xhdpi/ic_menu_add_white.png deleted file mode 100644 index 1d5398907f9aa86ea44ce166176bd2ef37f60f14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 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?XPJD~CLo-U3d8Ta1K^bI;}z~eT5!Ci*PFA{hD z8^kR5t#>KWd1k-sn+cp-A2&@FxG?*r$^L2kPHi&Lv*>$lVSgZtPfgRjtp4(vRX1~u z!&!JLqGk#XQ$1gk1f7*C&c6qv3eLKfk9L?(fos7@C*J z%I3Q@sP>sFCkVzIxV58U>&a`4o%fzexouC0dL-A-d(3y%`}i{<@76S2?4BIP-WOYK z7B_ij=xXkzf)d}&JkK7Gjun-=-pICtq1v~7!H)7%RwBQ|SRd;jP_&3pQn`7?*J2;L z-vQ$bW&f5dhuz{n8vmj3i;R9{eV4_zrB{yKk85S?(3@jDZKhN1!OeRYe#yA+|A;yE z+>y-7m(IQnF4zzyG+l48Ayeh*`JVe9XItN8TJNLsbZv#AH%Hu>3AuHmMU2^xnXVn% z9%`hsX|2)qb1`f7e1EuS$M&6~_wU3?|8G8ADD%AjGvh+5nO~3G`F$H0=Bg#G5hW>! zC8<`)MX5lF!N|bSMAyJV*T_7?(9p`z(#pt4*TCG$z~E`uj*loBa`RI%(<*Umm~x!~ ym@XJ3K{f>Er#qPK zpt2;$FPMRG*G_41C(F#}3ANkjg}t!o{r<60XvI@Uk$1PszkNuP@3_bD>vx&{pRaO< zmxkJLKRU;pTyG*~+VIlPZ84Ymq9sS4a6a27$~v*CkL8W->z}+onEtjt=aVtMzsl#I zfAt}wlsPBgue^T#GyCqQnR-)h=gc}&yv$cE;?m|f9eaV%zroYRF~sBe-DxkQ83RR* zX>RE{5wt8LUO+VH(jr$^!Hdf-&HLth`p@^7%MG93lRSUsW%l#awe!C3v41zS_}PM> zzo!GPZ>+iUn1NTjMU3?YLxuxmFN4X#hBSt#00(V`D#_^Cj`>gga(8nw6t}ll=UA;i ztM{$EEc6qf+v$?cAzv(F_ij6N^LqU6N6c$f*y{TgZ`s=%(mL`&;%bcfY6&@^51Tq9 z*!Q3BXH-*TP4Jpx#L~3zLP>?2%6Tq_7QITnQ}r9$C;5IZP`Cb>$er~tQb%Z$y+`kt zNfSDBg^#Y~`1DHZZpV)*)58-!xrN^K@o3XLxqRD-woi}BdS7~fw3OFeR%!S(JYhMT zLiN%mN9J*+KkYjAuB&U?f$VAC&2!rS?fCBT{~zN;MQxLJ6DCY{e_%e#U~yoBY>|%a zzKjs78ubtV<|G}np5AUPx|!oa&zfH`H|r-VHeOgdX}`j)%{*I!PdqR`KXt|BkFUEb z9-nbf+Vb~W57V@63oKem%YKKfe4?+MF8CSmB)ezMSEd#slUC x2Cg4054c%X5?aLz?H4~?^?&yl`~MMt7_QYU47U)Do(4=n44$rjF6*2UngBg)v8w<8 diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png deleted file mode 100644 index 0ab6a4037603c36b4d1ce912e94d74382e36f9eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6h{pNk1c@yR@>Xn=_}}cn9JyxUi~9#T81%V~7K*$StOF`z@O1Ta JS?83{1OP3QAg}-c diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png deleted file mode 100644 index 767b8080127096243af72afb9c32718b1b1ba409..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1232 zcmbVMO=#3W6dtWVwOSMup$ZyO6pL<>$?j&8*tKSpU0rZ%*OoP#pNl7j7LQ)klc3;1Q3O#79=s^xWPhq?@nA?YGcWJ^-ZyXF%bB6U zUEN*lx&Q#(+1*;6jOFm@TteP&E>=Y{^x$*}7u*qC)qMmM(;Y@s*49T+9_i-f;m4>S zfR2h)Ea6gak8HR$qlZ3B&GrZyfc}A+ryFAkQ^RP~a+37y!x@^g%p|=pp5tv z&O{>y2O%X042;DE0dAvs4)QEVZXp6=a$J!41l77|63sV9BG2($W9KT2NvaT& zVyR3*ibd%b*8HEWu|y0Tmd9`9(l(JA45xF&PZo3SgB;Q`K4}g^cyXLG){m^F6l*U( zzEZkQ>|8VTdh`Bk?=PKvm;F!>GQ$a%is8WpWnTV-7CBux_<7;?2DsIjSc{&09f^h_o6?IrCp~6X16bW zdhELwso&N6rlucV=!?r2BArv<_NU(dB~M=^zkYxJ`9}ARJ7C45U}pQKNxRG(Sk;XF u7hfo;VQfw4FYC9Gf5_sNwW(+M#Og8_eR8P&>|2Ko$dyeGYIjrR6F&iV0dfKW diff --git a/res/drawable-xxhdpi/ic_menu_add_white.png b/res/drawable-xxhdpi/ic_menu_add_white.png deleted file mode 100644 index 16a8b8a9603083f50f7f13a35e2eee1f59e14efe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUB%?PPE}nQaF&zQWVRF{I+w+uM$LhYSQ-A5LGkDyop> zUA;+PLx+}P`9z%zY2%DzH=4iHpH@(vte$-6#zdeI3=DgH7jtVYy`x_s75(V;h1L5T zzF%a`vHMzYBJO$m#UUe>FRCw>m@bL#Ub1+}=@XBPSX4aOJ>~2B&Mxkr^y!S_b@u+! z>8cC1aGY>(U}G{8n9$h3!;+$)z|1HK725ItZ1mg%VNtQiZ_hkq(6sK{`CT2~n!i~! z&MUqmBl4cR)oSv)+1g9500pG7o=0qx?uk&5U7lG~si40$7VZJ(X${XneoLMIB`&?_ zhhDYj`O`XA!v)>8TW?|s(VtK!01mzVe;M-U+ve?bw+{vKRZCnWN>UO_QmvAUQh^kM zk%6I!u7QQFk$H%rp_QSfm64IIfw`4|!PBlCA5k>q=BH$)RpQn#lV44$rjF6*2UngC^b{6+u( diff --git a/res/drawable-xxhdpi/ic_sysbar_quicksettings.png b/res/drawable-xxhdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index ad964b41f40a33c91d0f75ebe39bc158a4cbb193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1363 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7*7QFgt#(HZ68I$AOy;fKClNy z?evl$zhDN<>lXxiEH+2qY-0VrQuU(uH>N^`Y3?ko$7?0n5*}?+mT71y`nkf+<=1pE zX5T-OpKg~63$FT*#;85>-Cg#NS4{pMogK<`q$*hI^F5Ahi+fAtb@d-|tEpewZ?Kz} zZ|@fVlbk#?T3;hx8Hoxx-tvlFR$SV>J#e+irhiiprTFcf^ybT*%RWyw7>m!SSIKvB zmFqvB5ovgA?j?oR1q=*Ki#=T&Ln02posk_aH z<@g)@yI1Aj->Vn@omI0Zqke7UwX4;9CtTUXA3Fa#oc*}XNXc!%M$P*5JC~a5s0vm6 z+;Yh3-mPovN(3ydc3;VR+hO<4QcKWOs$zY=$71~qp1B*A+dJvFS+G=INj_5KqIj|J zwVcpPaa(4)mX0|AtQS3-x`Owle=zYgDQOdSUHanY!-$+4dV6gTRk<}Ah+Q~V@*w64 zqi|tZi5*|iRPlexo!tsWoz+`UJ2RNrIVw-~WY}3Wb^cqT5B{STYjg;MK?N=#iHj>Ir}J{d|HApTgg6CXR{Rr{1u>p69yZ zmR9#PSHDXARqh)On4i&;Jgn*|{Ic%vcJDVqIXlgT&flK!cJ8#R$1iO&n_fTTXH0S3 zpMT6IKR?dex^`=(S^UFEpH79n{TY!Sqr=T97-@LV^{>g~HKx@9KXi21pF}?4)<31- znl(+h_Nd&AeT9qOM@*bAymaHDDnFAB(Z30{dtW^MMaH~vgcUwl;l YgJyf<4S@?Sz#PTk>FVdQ&MBb@0Ixtt00000 diff --git a/res/drawable-xxxhdpi/ic_menu_add_dark.png b/res/drawable-xxxhdpi/ic_menu_add_dark.png deleted file mode 100644 index 01f53fee5e9b7d80ad9a40f9b82c91b391d24344..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYt_)M#foSv7?;n98j3q&S z!3+-1ZlnP@ik>cxAr_~T6C_v#4*XA?;%wCZ-(I3-foZzQnv>6Zau^sg3esoFZL2yB PRLtP%>gTe~DWM4fs%Irl diff --git a/res/drawable-xxxhdpi/ic_menu_add_white.png b/res/drawable-xxxhdpi/ic_menu_add_white.png deleted file mode 100644 index 27a15f5f10689b3499ca1ceb159a383585f943d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1191 zcmbVLO-K|`9DlBTh$uwR!60~y^aah%yxG~08QgT;S#zN^T^I7`+nKjI=zKKuwjITT zC>@NTYjvtlU8++ZDinf@x^yngK!OfM1|5nn_C|M2$UHPK^WOW<@Av!v-~VG_aNt~f z>(N#KKzqJlE3$Pod|M8%@7j%8iY*;9H$sP<3aw#}fQ;dk3Cvq~j1&nrrY^lAT>vx( zW@&_u6wa%~wz zU6c?^Dp3@d6@<<}NklOLiGrl?2&r;XMG07cIOfeWDr!;dtNUW7G&fGEs|rG`R*TkR zQO6q-kfJDpC<&6pGX(EX*%Sx7?RPd5G~(-?=~C0NVW^19PL-xP7U|X%EVoeD7PkF* zqFBm=0J{Q;ih^Z@_u54Jv`GGhu`AjyO}RuU65pwMI;%&evq5IL+uKnHWYMS>Jd+g# zPil@{wTMmgTAE{jqK0XxVhmSMSr++NO0V#8OiuFHs9@e8dO{(xo-7lop|cxb>s3;H z30aa7u?#{vIh9G~wBD2?$#GFjDA@)#Z~GM6I%)VeneRFm?a5WM9>LV{N{%zx=z_s< zhdTba#~FsB9Gz-^Kw~A z@wk#wc&sC0kc6I65(Zc28~>X@fdwUm?XshN8Yb40;dXl%*kOB|h|OlmW5aUoWv0po z?L}V8l!A9(R+?I8VO!78$<>Y5-&?MV+RR2Icm2vx$IZ9&;n%|eKmhiESpW_J5CJ^^ zv;fcqZa-O`|MYBn;n<0WWmnj@sUsiuzh9lX`|Br;tjyJQ-ZVY>{BgdzxY7K#@D7=! jA8U(uaO7W@$G0MFVEx{~<@?V^j|2APa|7Cg-qE?=A#G+x diff --git a/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png b/res/drawable-xxxhdpi/ic_sysbar_quicksettings.png deleted file mode 100644 index e89d484c153475c2b0d7761d8023077cd48292ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1761 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wF4!X3ZTp6aekD}2KAU*`T7dn;z z)6lMxAirP+uP5%zuU;@I%Q+M#&1l}g^x1K~mnOVXdW`|$53g2A#63RirqO%OQ1O&!fz+){@&Z>|5Nqude(Xu z9WmF2^lyt*&cEBiFL;|}i@-_FKPg&%b509wm0z2GY_L)u2umppnct$)S2EalYaqsQSm(f9vBF8*^b=Tgxq~mdT?iLpvlcND#7cX6EGTDA=?itu8@YyS=6M{`8-(h2$r;KRk1X(eJ*+eZBM5_wFB_yYu-R>u|Ntt@<^J65f9}MC<;| z_{Zqo>CM8X$kfCsaN6L#082z42S+2r!j1+}fdo~h1W^_aXOu6-mzQC~2AYpBK-s>k_Ukm+8mFk#z0@N&2)znT-4qoy%`0}%$P-)>eQ`Kyf zg%giG^QoR?rRHt?-T9lC=YeajcM5X*-Wr)V6(mQ`^PM_ree@2!37_u2J8@M!O+>Ox zp!0@gzK)rtp7*C8{~W!R=g10jqz7usZ|JU&o^{ve|E8k#j7N@SyHs;H9ohW%dsqSk zlk&_4uO^}25&wP{{^`8Q^jlokfoX!4M1aEura3b|d3|8$%3=u6`pGeq@7k4XSFc_( z*Dwvb<;?KFz}~f9<;KEXp3B~USQ!q)C$V1L7qn^TC$$xQX2n8LQJIy|ithL3ajY%! zGur(sI`-)`v1NZU*!TFajdDA*(a$3pD6y7bLUiC$JpEC#`mZre;|<(WD$R87?HV*Vm`SBd-i#)ah* z1rn}&cFmhsxyhIP<|Q_-D$gVJXLSB;DxVqmMEhmXx4Dn+P3>BpTk~ITMPO|5N_B>f z_e9%D*7AZiORr z&*9%+1gGuKlVY>+b7tb%QJM2NZ_DbLOG`vpKOA|xSoixQ&HOdh&-T_IEsone?_xFY zjHl&u#P7*H->_|k?K0U<>pEvO{F)y0P0RV~hHq0JTe+;#yd8i1Y1{Q}r?1uQtN%3n zr||BcL#;+1u4&!;nj0NDS#G!{GemncVxbC(0H-G-Wr)|5<$ModnIq^b&r*5b{ zxgc2DsI0!D>+2hhugW|>TFO4%=3usaT&w(xiD};>+5Lyx_uv1(5UP+M#Q#C|lfL_( zBSOFC+iyHk=g=^}qaj`(!S>nlGlC2sq=i4Q*E#FTa`_SKyk@0E7|vy#+*2HV@r Wr=EORwjNmQFnGH9xvX - + + + diff --git a/res/drawable/ic_menu_add_white.xml b/res/drawable/ic_menu_add_white.xml new file mode 100644 index 00000000000..9a06d5cbca5 --- /dev/null +++ b/res/drawable/ic_menu_add_white.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_bt_config.xml b/res/drawable/ic_settings.xml similarity index 99% rename from res/drawable/ic_bt_config.xml rename to res/drawable/ic_settings.xml index 316c6749a65..439c1a7c8b6 100644 --- a/res/drawable/ic_bt_config.xml +++ b/res/drawable/ic_settings.xml @@ -33,4 +33,4 @@ 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/> - \ No newline at end of file + diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml index 1a4dc8efa8f..fd70ad543ff 100644 --- a/res/layout/dream_info_row.xml +++ b/res/layout/dream_info_row.xml @@ -89,6 +89,6 @@ android:padding="8dip" android:clickable="true" android:focusable="true" - android:src="@drawable/ic_bt_config" /> + android:src="@drawable/ic_settings" /> diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml index fe575a20a4f..d571b5fe0f3 100644 --- a/res/layout/preference_app_restrictions.xml +++ b/res/layout/preference_app_restrictions.xml @@ -83,7 +83,7 @@ android:layout_height="fill_parent" android:paddingStart="12dip" android:paddingEnd="12dp" - android:src="@drawable/ic_sysbar_quicksettings" + android:src="@drawable/ic_settings" android:contentDescription="@string/apps_with_restrictions_settings_button" android:layout_gravity="center" android:clickable="true" diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml index 17ee70c0097..c339e675f21 100644 --- a/res/layout/preference_bluetooth.xml +++ b/res/layout/preference_bluetooth.xml @@ -27,7 +27,7 @@ android:layout_gravity="center_vertical" android:padding="8dip" android:background="?android:attr/selectableItemBackground" - android:src="@drawable/ic_bt_config" + android:src="@drawable/ic_settings" android:contentDescription="@string/bluetooth_device_details" /> diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml index fe8e967157f..277fc2382b2 100644 --- a/res/layout/preference_tts_engine.xml +++ b/res/layout/preference_tts_engine.xml @@ -41,7 +41,7 @@ android:layout_height="match_parent" android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:src="@drawable/ic_sysbar_quicksettings" + android:src="@drawable/ic_settings" android:contentDescription="@string/tts_engine_settings_button" android:layout_centerVertical="true" android:clickable="true" diff --git a/res/layout/preference_widget_settings.xml b/res/layout/preference_widget_settings.xml index 6d9ac2fe051..dfeca1a4431 100644 --- a/res/layout/preference_widget_settings.xml +++ b/res/layout/preference_widget_settings.xml @@ -27,7 +27,7 @@ android:layout_gravity="center_vertical" android:padding="8dip" android:background="?android:attr/selectableItemBackground" - android:src="@drawable/ic_sysbar_quicksettings" + android:src="@drawable/ic_settings" android:contentDescription="@string/settings_button" /> diff --git a/res/layout/restricted_preference_user_delete_widget.xml b/res/layout/restricted_preference_user_delete_widget.xml index 7ffb0e4e7a6..7fd5d88a04c 100644 --- a/res/layout/restricted_preference_user_delete_widget.xml +++ b/res/layout/restricted_preference_user_delete_widget.xml @@ -35,7 +35,7 @@ android:layout_height="fill_parent" android:paddingStart="16dip" android:paddingEnd="16dip" - android:src="@drawable/ic_sysbar_quicksettings" + android:src="@drawable/ic_settings" android:contentDescription="@string/settings_label" android:layout_gravity="center" android:background="?android:attr/selectableItemBackground" /> diff --git a/res/layout/wifi_display_preference.xml b/res/layout/wifi_display_preference.xml index d8c472915b8..99cb89cb96d 100644 --- a/res/layout/wifi_display_preference.xml +++ b/res/layout/wifi_display_preference.xml @@ -37,7 +37,7 @@ android:layout_gravity="center_vertical" android:padding="8dip" android:background="?android:attr/selectableItemBackground" - android:src="@drawable/ic_bt_config" + android:src="@drawable/ic_settings" android:contentDescription="@string/wifi_display_details" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index 3b66469c18f..a194cc1c960 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -119,7 +119,6 @@ #fff - @*android:color/material_deep_teal_500 @*android:color/material_grey_300 #858383 diff --git a/res/values/themes.xml b/res/values/themes.xml index 694c5c6f85e..2d78d0b2fb2 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -18,7 +18,6 @@ - @@ -41,7 +40,6 @@ @style/FingerprintLayoutTheme @dimen/setup_fingerprint_progress_bar_size @dimen/setup_fingerprint_ring_radius - @drawable/ic_menu_add_dark @*android:drawable/ic_menu_moreoverflow_material @drawable/ic_wps_dark @color/setup_divider_color_dark @@ -66,7 +64,6 @@ @style/FingerprintLayoutTheme @dimen/setup_fingerprint_progress_bar_size @dimen/setup_fingerprint_ring_radius - @drawable/ic_menu_add_light @*android:drawable/ic_menu_moreoverflow_material @drawable/ic_wps_light @color/setup_divider_color_light @@ -149,7 +146,6 @@ @style/FingerprintLayoutTheme @dimen/fingerprint_progress_bar_size @dimen/fingerprint_ring_radius - @drawable/ic_menu_add_dark @*android:drawable/ic_menu_moreoverflow_holo_dark @drawable/ic_wps_light @drawable/wifi_signal diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml index cd0103d476a..1375ed4f184 100644 --- a/res/xml/user_settings.xml +++ b/res/xml/user_settings.xml @@ -26,7 +26,7 @@ + android:icon="@drawable/ic_menu_add" />