From 3debd0691d2b51939700e5091fdc970dc7a358d4 Mon Sep 17 00:00:00 2001 From: lindatseng Date: Thu, 28 Mar 2019 14:46:36 -0700 Subject: [PATCH] Tint icon colors of storage screen same as other screen We were using hard-coded colors to tint the icons on storage screen for some reasons. Change it to the same way we tint other icons, as there's no reason to keep it special, and also per partner's request to keep it consistent with other screens. Also update the ic_sim_sd icon from png to vectors. Test: Manual/Visual verification BUG: 113977374 Change-Id: Ia0210635e936b6798aaf9e48dd8815a197396065 --- res/drawable-hdpi/ic_sim_sd.png | Bin 836 -> 0 bytes res/drawable-mdpi/ic_sim_sd.png | Bin 700 -> 0 bytes res/drawable-xhdpi/ic_sim_sd.png | Bin 912 -> 0 bytes res/drawable-xxhdpi/ic_sim_sd.png | Bin 1144 -> 0 bytes res/drawable-xxxhdpi/ic_sim_sd.png | Bin 1541 -> 0 bytes res/drawable/ic_sim_sd.xml | 27 ++++++++++++++++++ .../settings/deviceinfo/StorageSettings.java | 23 ++------------- .../deviceinfo/StorageVolumePreference.java | 14 ++++----- 8 files changed, 37 insertions(+), 27 deletions(-) delete mode 100644 res/drawable-hdpi/ic_sim_sd.png delete mode 100644 res/drawable-mdpi/ic_sim_sd.png delete mode 100644 res/drawable-xhdpi/ic_sim_sd.png delete mode 100644 res/drawable-xxhdpi/ic_sim_sd.png delete mode 100644 res/drawable-xxxhdpi/ic_sim_sd.png create mode 100644 res/drawable/ic_sim_sd.xml diff --git a/res/drawable-hdpi/ic_sim_sd.png b/res/drawable-hdpi/ic_sim_sd.png deleted file mode 100644 index 50a16dbbbb8771aa75a97c9d471e7194e7e0de2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 836 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_@(mBAzaeArXh)&N!bZY$(ufZ|PYA>C^n{e;h4#PZ)qQ})z>B-5T8)q4a-O&4x z*bx07s>&p&@|;{kPeR%OI|HV5SDx40Jh1(%&0U83jT=i27d){)&#>z7mxh%Id?t}6 zx1E3TSo%ZYuQUA@jxia`XEkP3J1{eAb?E<~oq_jVa?_bVh*hW^xYcy4aaQ`VgEfKo zRX?y*aK1V5(eQ)Q(}-H@1KJO^9#fd1zA^K$!`BmEwoclZux#GbmRAert*(7-Tl{Nh zy70X9JPUr9)iUw1KI=DJ$r+Vn)cEMO3ERFZgYKBNn?dYV7H{8O_ubYnrEXP<9+ z%N^c5(>rts6XMW$3FWx=Ti>AE#eA{!!9F0H0k<4owuQ_BZ ztgpZ6UA)xc!}R^tVvN7^Kdor!s$0sv^y>G;jK6qeJjy#8L#OPliDM|YbeQ&P{dv)X zS6^p~imERU@obNiSo>^sZP61W;n^YbKi@A|@3cXB{l@(fRsl zlJCkRA+vSnZiuqWy{cptHiD0w}V+aP=h4MhT#0PlJdl&R0hYC h{G?O`&)mfH)S%SFl*+=Bsi4%%;OXk;vd$@?2>>qoUL61c diff --git a/res/drawable-mdpi/ic_sim_sd.png b/res/drawable-mdpi/ic_sim_sd.png deleted file mode 100644 index 19266089bccd058e00733bd6d8090b8a7c629819..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 700 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&)RwJ)SO(As)xyPTTKy*g)V|y%}p~*EBsH z8wQRFsd>$7PIm^|^#p!`6jg6&$P?#U$QC9FA2 z*$1RIFol$!5na4c>W@$AEyia{pUGCvXIOt=`9=BAMLD5AIR1F2E}ie1{ABkz1)ZbL zjPJe84sKMGthm^G-sr;SMdvv-eT`->n_B!LkatIT@7~~FYZ<~Dr(1M;xx6^`g4eYF zt3ajDPs!g4cAWEMNqNa?tKt5@>xHuIhcgv_gnfJ;{F`+}X+|d7$@Kxp5+bZC6C|fG z@a{`4FPi?Pei7$s4~g7^5+@Y|H_2^ak74o-b78$$eTg|e-k@zdOYEY6S=kTRBIYde z;j2)${?cyF{W|`Mr~is85%Ga*Cfa9xzApWM{daEqMFU~qW55VfEpd$~Nl7e8wMs5Z z1yT$~28JfO2IjhkW+8^=Rz^lvK(>Lom4QK*Y~O7Z4Y~O#nQ4`{HT-rkO9yI@1lbUr rpH@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@(1Wy;okc@k8XT|1Sb`WW`U)~Vq!Q#J$ zG2~i9OM-c=i_;R3BmUlD7oIA#B(OI;XcYax(zImDAv6Bs_MXdyHOC*9Tsr06WwdYO z`#HwN&(-%aKbMJAkK)Nx0+%h)2b)zPIVG5zv~-Z zHuL!1_3VkU;(X@w4Y3bSWF8HWVSL~C{6PB0;47UO>I>%m;m+JRLvF+QdiHnB^BWkg zA0H|&uF(E@(q8maCGSF`1AGNMcUZpJd<`pDsr*Ub@U9I*o%Io;Gcy=|h$ie;y8gW( z`+!Kf%@&~t>igB76el>JxWiU=V(<0F{GffTe{we5XV}M}yz`#O{;d}{KTNJ?+B0cW z@6R9?pQpFZ`DnbAzS17*&G_}n_oaI*`Zo2Q($bMXQuk>$_Y-k#U283Ot`C#tnc2Nh z%(wi**$6iwnk8nyp%ag;k}(ekJH#+QcJL-MQ>&Km?Th`r!;?yvH* z*~Y!LP7Q@Y31So5`_^jaw9Tlz6Fb9f>7UR{d7%xmnX}wtFG;m;W3S=ZxY}7WM|1=1;h&)K=ZSTcmEXH*L$WSvpXIB*=!~{Irtt#G+IN$CUh}R0Yr6#Prml)Wnp^!jq|>oWbDf>gTe~ HDWM4faT|BB diff --git a/res/drawable-xxhdpi/ic_sim_sd.png b/res/drawable-xxhdpi/ic_sim_sd.png deleted file mode 100644 index e05e7adc25467e94031df5a97318dff7637cbf06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1144 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}nQh0w!0h4a;uunK>+PJ=dBTPw4(FGcWF6_# zz0Y9JP{SB~giBzmRi=*utx6G_(}Kko)Umx{|8S#}+na@3!$jrqA+y36oaHtj zE&A^%htBPpbF28-uc|pWSX~39RJ@~Zck90RcIN$*9ag*dKG?oY*ksZq#>!1q3sYYk zm$G?zDX)m}TmCSr_yL2&t?O&|A7`92OWZ_HeRJ;~{yWQVdi-MD!@jNY`T_Gl(jkGD zCQ6>z$!?ReCC-`MBDr3VaeAZeACFZI+7o4R7QbWSe_MFDQe*qqFO9(mydTW4jsLl8 zwqQul92sHD{x=(~@2kw*yD!v7&x&`B@`qzb#6#|_eP8o26{y4$BpL zqQ5ryR=;sS=igOs%zSOn^^K=?I9PCQd0Q>SJxj)Nw#e?Qb_IKuEX+Qj?$gv8dTcpw zisIoK8ONtZe@-+emH+EI$!pi#cIrx6mE+OO!vddsKF>(n{wZ>0fnL~5NlvN$IbzSw zeQi(=kzD(a_vL?Q2`k^KMNX3&i z2}-HV6>0zDx>Y-5+#~q3-iN(D5Ukc8#_d}QRQ!rf*-~>E|4B~Sqkk^GQu}ac-umei zR`-}~Jf$M=goUT!^^7^jzT2fjEW}s)2stJwJ)Jex`0biM8b{f8ZEZWHA~+@anUVB1 zN4@t~7Bbg7`#f!i~AO2oW3o__%;cb{sp@fHeb1x zyEV?_j?^)E2f0l-7A8%64dp#%XY_CK2R!PDxUtVv-Sb=vgo~x``S)5Uhrpizj^jIUoK!)OztvEOmwat!;9*j(+GeI{t^TZ`a-G<|F&=12dRviEBhjN@7W> zRdP`(kYX@0Ff`FMFxNFS3o$geGBUCPvJK3w3=Fzt`);FX$jwj5OsmAL;kScXI#7co u$cEtjw370~qErUQl>DSr1<%~X^wgl##FWaylc}H*fWgz%&t;ucLK6VBY21SV diff --git a/res/drawable-xxxhdpi/ic_sim_sd.png b/res/drawable-xxxhdpi/ic_sim_sd.png deleted file mode 100644 index b12e34efdfb997fdba375785c9f2f9625e00bc39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1541 zcmbVLeNYr-9Dea6$<(YlC4y{QDV1SwcW;lo+mnOSJ5J6xB*46w99j0>gGKK4+FiT@ z^&7!Pu=Jn_5qP1(VL@+&Pc{Y3_z15FjU&q> zj*WyUE6w<*D3>!2vx*YL(lluVPibk)z-s6;9ZS=xn3kd$lBP&4OVG4QXE4!vZ0x~N zHp%TV<=gCIxzNmvmnn+hM3R9(KoejzqEt%KEX$IVmegtq6hX*UK7|VsK6!SO!3Jes z68wrF`mhKiS0Yv_W*jLUJ%ZQobdD4IG%P!=mC9^Hp$b`*@fdvKyiAW~ymA_?eHxC)!dS9+mOaoEf_+R?ZLw~1mn4_%_8 z2*${J2pyv{5S-h?5pKxqS*YU;B~TmXxgXw6X^pJio<->l6isL8j9P;(%V54fc`eI9jv^@9s3&wDK8-LMX&u2a6k~vV3FHiVd<^gY zzvhuh6d9?M|5Q$N36*1HINk?nGTuqhhuTL%eX@Stq+$Rj%yrln6b66!?ZP*U4;QPC z4DBkP5l=&KLE+E0q#a)!>tx#KY#wz>nAtnEblGq zZMyT_C#`q)Zt6?QV82Y7yMjq&p4p!&lk&67J79tS6hn&NF3? zP_|76Vq+}#AmRY1>r}1rw6+`K!H3M0-v=gG%!fgX2J~MGeLiJt_|451k}N;JxCc&e zoO!!w+39O3+3}v%j=bUOJ+MJzt^DCs!nV(He!A5C{t!LTq<{I=tj77fUhOK13*DW6 z)6v_p{&X15>gH3vKYBL1{8DOvMG}%(Gjmi1eXIqjz`$EoimQBJGui--tX$g{3yatN E1EjedqyPW_ diff --git a/res/drawable/ic_sim_sd.xml b/res/drawable/ic_sim_sd.xml new file mode 100644 index 00000000000..d7e31a24809 --- /dev/null +++ b/res/drawable/ic_sim_sd.xml @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 2e52e6b4642..a24f82b3535 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -23,8 +23,6 @@ import android.app.settings.SettingsEnums; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.graphics.Color; -import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; @@ -76,16 +74,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index private static final String TAG_DISK_INIT = "disk_init"; private static final int METRICS_CATEGORY = SettingsEnums.DEVICEINFO_STORAGE; - static final int COLOR_PUBLIC = Color.parseColor("#ff9e9e9e"); - - static final int[] COLOR_PRIVATE = new int[]{ - Color.parseColor("#ff26a69a"), - Color.parseColor("#ffab47bc"), - Color.parseColor("#fff2a600"), - Color.parseColor("#ffec407a"), - Color.parseColor("#ffc0ca33"), - }; - private StorageManager mStorageManager; private PreferenceCategory mInternalCategory; @@ -176,13 +164,12 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index if (vol.getType() == VolumeInfo.TYPE_PRIVATE) { final long volumeTotalBytes = PrivateStorageInfo.getTotalSize(vol, sTotalInternalStorage); - final int color = COLOR_PRIVATE[privateCount++ % COLOR_PRIVATE.length]; mInternalCategory.addPreference( - new StorageVolumePreference(context, vol, color, volumeTotalBytes)); + new StorageVolumePreference(context, vol, volumeTotalBytes)); } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC || vol.getType() == VolumeInfo.TYPE_STUB) { mExternalCategory.addPreference( - new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0)); + new StorageVolumePreference(context, vol, 0)); } } @@ -192,15 +179,11 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index if (rec.getType() == VolumeInfo.TYPE_PRIVATE && mStorageManager.findVolumeByUuid(rec.getFsUuid()) == null) { // TODO: add actual storage type to record - final Drawable icon = context.getDrawable(R.drawable.ic_sim_sd); - icon.mutate(); - icon.setTint(COLOR_PUBLIC); - final Preference pref = new Preference(context); pref.setKey(rec.getFsUuid()); pref.setTitle(rec.getNickname()); pref.setSummary(com.android.internal.R.string.ext_media_status_missing); - pref.setIcon(icon); + pref.setIcon(R.drawable.ic_sim_sd); mInternalCategory.addPreference(pref); } } diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 14fd42e23d4..0734c0b66ad 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -50,16 +50,16 @@ public class StorageVolumePreference extends Preference { private final StorageManager mStorageManager; private final VolumeInfo mVolume; - private int mColor; private int mUsedPercent = -1; + private ColorStateList mColorTintList; // TODO: ideally, VolumeInfo should have a total physical size. - public StorageVolumePreference(Context context, VolumeInfo volume, int color, long totalBytes) { + public StorageVolumePreference(Context context, VolumeInfo volume, long totalBytes) { super(context); mStorageManager = context.getSystemService(StorageManager.class); mVolume = volume; - mColor = color; + mColorTintList = Utils.getColorAttr(context, android.R.attr.colorControlNormal); setLayoutResource(R.layout.storage_volume); @@ -107,8 +107,10 @@ public class StorageVolumePreference extends Preference { } if (freeBytes < mStorageManager.getStorageLowBytes(path)) { - mColor = Utils.getColorAttrDefaultColor(context, android.R.attr.colorError); + mColorTintList = Utils.getColorAttr(context, android.R.attr.colorError); icon = context.getDrawable(R.drawable.ic_warning_24dp); + icon.mutate(); + icon.setTintList(mColorTintList); } } else { @@ -116,8 +118,6 @@ public class StorageVolumePreference extends Preference { mUsedPercent = -1; } - icon.mutate(); - icon.setTint(mColor); setIcon(icon); if (volume.getType() == VolumeInfo.TYPE_PUBLIC @@ -138,7 +138,7 @@ public class StorageVolumePreference extends Preference { if (mVolume.getType() == VolumeInfo.TYPE_PRIVATE && mUsedPercent != -1) { progress.setVisibility(View.VISIBLE); progress.setProgress(mUsedPercent); - progress.setProgressTintList(ColorStateList.valueOf(mColor)); + progress.setProgressTintList(mColorTintList); } else { progress.setVisibility(View.GONE); }