From 17606f88527eb6c90c51784ae4bc08feda9c77db Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 13 Jul 2009 17:52:19 -0700 Subject: [PATCH] Fixes #1972593. Updates AppSecurityPermissions styles in Theme.Light --- .../widget/AppSecurityPermissions.java | 12 ++++++------ .../res/drawable/expander_ic_maximized.9.png | Bin 1795 -> 1149 bytes .../res/drawable/expander_ic_minimized.9.png | Bin 1757 -> 1172 bytes .../res/drawable/ic_bullet_key_permission.png | Bin 584 -> 597 bytes core/res/res/drawable/ic_text_dot.png | Bin 332 -> 476 bytes core/res/res/layout/app_perms_summary.xml | 4 ++-- core/res/res/values/colors.xml | 6 ++---- 7 files changed, 10 insertions(+), 12 deletions(-) mode change 100755 => 100644 core/res/res/drawable/ic_bullet_key_permission.png mode change 100755 => 100644 core/res/res/drawable/ic_text_dot.png diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java index c4b5ef8915586..6579660011515 100755 --- a/core/java/android/widget/AppSecurityPermissions.java +++ b/core/java/android/widget/AppSecurityPermissions.java @@ -18,6 +18,7 @@ package android.widget; import com.android.internal.R; import android.content.Context; +import android.content.res.Resources; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageParser; @@ -319,15 +320,14 @@ public class AppSecurityPermissions implements View.OnClickListener { boolean dangerous) { View permView = mInflater.inflate(R.layout.app_permission_item, null); Drawable icon = dangerous ? mDangerousIcon : mNormalIcon; - int grpColor = dangerous ? R.color.perms_dangerous_grp_color : - R.color.perms_normal_grp_color; - int permColor = dangerous ? R.color.perms_dangerous_perm_color : - R.color.perms_normal_perm_color; TextView permGrpView = (TextView) permView.findViewById(R.id.permission_group); TextView permDescView = (TextView) permView.findViewById(R.id.permission_list); - permGrpView.setTextColor(mContext.getResources().getColor(grpColor)); - permDescView.setTextColor(mContext.getResources().getColor(permColor)); + if (dangerous) { + final Resources resources = mContext.getResources(); + permGrpView.setTextColor(resources.getColor(R.color.perms_dangerous_grp_color)); + permDescView.setTextColor(resources.getColor(R.color.perms_dangerous_perm_color)); + } ImageView imgView = (ImageView)permView.findViewById(R.id.perm_icon); imgView.setImageDrawable(icon); diff --git a/core/res/res/drawable/expander_ic_maximized.9.png b/core/res/res/drawable/expander_ic_maximized.9.png index eb461e9d3827c1ad11d4b0c3081db62179a6a6a1..778255ae27c83ae6f2a94b9c4616c2bbc1db8f26 100644 GIT binary patch literal 1149 zcmV-@1cLjCP)B5!PO>j}N$gYSF1mmKWZn_dtyAN3f0?}X=A<#t?lR~5nfy7ZH zqS2V7V`rR)&+*akySaCIxtSS{iD6viz~_HF=l{R?&g(zt+T=|+l+=|&JO7}hrAk2> zij7uMTx@a*%105WN`(C#cJrq&MF4Fs;Ly7^fiU0)d^mCb6BmIWFNXPo7#kaFsYEF# zC^(;!lT*O{NF?$v%8O?x&CSiD@LxppBEgr3GnVF7Q zrqN^J6Z7BQ-QAp-nR!%SU;jJ)eF~r1B-}@ffKx5Z#f621U!6|pc}3Bh4Fm!&Dk>^| zM)hyRJbot;aQGVL+oh$Y-?Fo_ohkyXLN+!w0%c`o*HC?c*eCJ)Y)MF5Fqgbu?=M+d zSMiUQ-Mjj93A}6_3m*eyD^779Z9F0ab z7-aqZ{nFOfCc$7Z)@Oii?4yt2Z;mG?xm86JBM}u_1$1?FiO1uSP$(olJw39%z8>pi zoo(!+4}Gmd$VqNh5qS=W?4-n)LSeG8brIoo(!+4}GnJASbz1 z)3%*!d~k4}!Pt~TLqpQu-Y%=FtAfNOKA%te`uem!zuzx~g@v-Sv!e;2@AC5U|GB_s zGkEN(GZDq;B8CV9D=RA+c}Yo$Y;SM#=xNqmXCHm&YmFx-xm87kG1`D}Gz}6?Ey=OV z#qD;>*47qxy$06V#yCcv>gwvMtRjqpkx55KN35PGTN30Vr_QbRop_z@w(7rhCWHnYAT|#{71AHqy)AxWc(GsW}(L{SB zh@jW7`KE7Dyx+{^1Yy@uQQ6Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG~ z0U#Dx&$i6~00x6eL_t(o!|j+|XjJJL$A9lRCo>t{e035X2NP{=Ohwp>MMMJG6(n0k z7i8%YC0(pdFSZvAni2?J<+3-eOahXNQWSbs7pjX`@S_yOEO--Inif|QOfyM#Gn1KQ ztj^3i^S)0nJSR?OGO5-=d*KTYGw^=>pXdEQUk6?c;eR)T{{s+j$J_DBL%q&gr7T2@ zQc77OV)^@38R-QuzR2r1gL=g^3a|j@hP&kr$YPo?IRwK6OBdzSXo(N zadDBEnHjEMzu}6Qhs9#?>h0UNf9nI%TUlo-AeIjzbnMu%Us<;O$xlD~tfjlVn{C^+ zy^Kb_qDs9y>iP5MOioTRF)@)f#$3C5_wEqj`e4lK00}_UzyE&Eua#y0V0>)MYHx4f zaQPNw0$_fAp25LEqqYA0{{8zu0SdLis2boLp#JdT!@smF>&I8GUbTZK_;(;G!K|#T zaQ5t3ZH)QN!-o%l?t>{+K9gO86XAmg4}K~lKbx4C*cOY$FvehvK}23jg0+!IgzoNc z>-zQIenwn^CZjL;7@F1E_ zr#}z8sT_<|VGRoicXV`oTr3vf>*?vCR4V;fq^GBcVzKbvo;`a$2EzVbYBL}N-0(c_ zcwb*%sJ^~_%fq$S8)U1s_4W1i^_>p6Zt*x!4>;wXX1yerrBJHQ2XbJ4XD6jn3D5KJ zJa7HL(a}-*`}4){RoM5NjxBE~|*0V1yJ z#@ahNsz3}44KXz}MJ|_PczBrA)z$U6)zwvohlk1Ka!gH4F*Gz(1*W~d1JCnfKtw6! zl;2!gy*v6RR($dnp+Xj+MCP^d`#9}cD zg#yjZ%@hiS4gX`Y7>PuJWHMQ`e`#q6qjk{-v8C4p(K9zYJG&ts7-R4}k7P2*`1m+o zU0vk!d2HLpwr%qHJY8K~jE|3#OeXO>uPXk`&dwr`tCdsAi)iELf~D!{=_-wkF}SYF z+}s>vV`KF8_L9%%$>;O*_VzM1HpblC9Ioqbx_5ed8epj`-^gaUCImDAyF#JRpi=5b zw{G3CBaz4kt;+LAXJ;puE?olP!i5Vwe*Cy9BM1D*=kuI6aYBp871wpgL}UqA^Rx1X z5U>339?@E79mhGkYuB!Z&d$!7;XR#BbMoX#jvP6{qeqXb=F1b{ojZ4!oSgi|7?aRi ze+@hZia{o}H;Jruj^orhjU2)c_fuekxHdDTwV!cetw>jkr7WR zb+1$^{ZT|#fM>onWHXLp1k3|-z%r2WL2OzoIyF8M zXnzArDI+2Qcb1JY3%;cqMP$40^7!O?CL%ds^RI!dQdUO9torU+sMS`yQab@`1Kt4| zfd*hZ5b@^%o@w75^GaFIM9fp4nE&)S@gKDlRSlL>Dl8)P{*whD9Kcpe1y55_O1UDE z_q8whe0ZY~VR3a$5u ziZP;Q#>tGaI%@iTJLiNm*@8u0VSu;!26Izs73Lf^h@1ZvhUY>p2ht{J=JLoc});froow-XTUtMyhY2 zWoKvKOixeGW`8&wev0<^5n5GM)iC^5aC-$}w$A02mxgF#>dA$D=scBOG!y_ zyvj62Ecd(F4i68X&&@*!gWcr6idxC8Uv>gwuOX=!PhIs#&a?CtFZ^7HdQ$K`K`{qsU1(0K#q!`a!{ z4$QrmKDq*;9sppiJSi$FYQwFcz_Af8Z6|7_qobprW@Kb|kB*LnI6gj(LS0>*)YQ~S zFc>`5N0@QsAQw5c^Mo-9zLJuXyCzXAdU|@eBRJerUtce~yStLemmn884Q{PuS-I0hO+l5ULi4Y2fq_wqGkV{k$N2j8qLRwl{;`)=5 z+`1w{8ygz|GeN~8b#G~DDPasb$*n75v9q&tdVhca&?K;CKwg)YmP%@Bsv3d3ygV5k z9F(=SwNrj(Jh{k8Ze0;PXjZ1CrdH!k2g#e8o7KaKp`jr)1soCUgRRp+E^->&di4ZW zbOlV!@bK^_NJcK}+?p|EWo7DmdU{%oi1qX|4=?VDot>Rvb#?XExcwdCe!j>l%KiK? z@c!7?*hi?KuE!G+@A$R~zyjW{tgQS2w|@b?K}=Bl6g8X~`~W0BB11m2+wCeBko+vr zhrWzqEIG&(D?qE-M$i+OZ-HNHYiqxsn3!0@ut!WWrnO$v(ucl`VJtZeu76cydSTvW znFka#H8mCcd_EVpWjac}Yep&e_xk#Jcz%99*xlVdgImmC4}ss$6rfXM#;g&yQJCBU zZW!O4hRZXS`T#4ZM_jK)=^s3|`npKnXaw(}(a5j>00001P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXG~ z0V5#2Sa6pB00v!2L_t(o!|j+~XjIu5z<=l5ab^;`iAly7WyWYl*(fZy4|xa#3Jr)* zv8-KVpj|=x;6v1PEAhpG4|$V{$wSOTEkp}GY(Z^pOP5uP4}w0dY-v_dM_e@~Ow2zM z?aaCNoUaewi8GU#Y}OXq2M-)B-22_{``zz5-*>)q;q?&ycSHC;fOt3FjU^BD7P1P^ zD5Vim1@|SK4sa+Xh%7l7)DmT08;8hGcI@~#7L9I?L?RymYm`#&0f@+~2+yny{*lY& z{(9xgmCu171e5OqQcHmFfXKFO+kPI6M)zv1TX*i<8Qrj918df-p`oDxfQg9-o;`a; zI-TayrAx+%+%`Eg^u-r{`+W#x7lT<0M28U3A9r+|^0fZ=z<~pGZEbB-S69EOMz7tE zQg2kfdi9E%H*YdHI5_33`~1tRUw#Id5XOBUkUT`Zy}kXnp6C6nzrSCnQmG>26~8Wo zdh+B6-3JdkME-E&#*JSB*-9{~0$c=$x3;$aMr*xqXlTgGhv2&)N?|4@CfK`ouXWD- z?)L55zXGx-6_hISDy)gvmMvR;AtDC{2M4R0nwoIV;haN6mNfISRaI5AwYBMs7cc%W zkw`orA0Pi`!2&J{K{;UAvf>nOX46T08$< zGMS{iySpw3f=__z(1xl6l26fCb93`Y#+VP=+uP@rmCjSAPBAw($IF*5Idtd{)6>%x zWrHA~y}cb{%!kd*%^#suEVQL6c_aeFjWOFhJ3FKCc)X(Gv9U1{i3F=xuV#FFoFhk$ zFf%h#Q9d4z)7jY>HO6d5Bp%wT=#gb1NXw>8n+Spc-}mu-e}Uq@zCKp2T!}G;L?S^Z zli|dP6AR=D-`}`#BgU8(rF1;BRn{Xqq^$CNzbTbWR)h$GfbsEhPM)LOf|A(2?1sBq?TImX7u=#MmG&JCxTMk4^K_cbKIe@hmrPO>HmK#A3aR2^&rl+Sd#^8A#)z#J1 z)YK3JK~YW7T4Sw6L{LgaM8vBUntaxH&bi#^=;(ays5ED1XE}E471otrPTbr1t9YJi36;Nj1CVEFY1ln-d-jrC#kKi#TY{}nWVS3mj@3X zRD5T6co<+*L~Lnw)g^7c1p+7X)wy%$?Ck99ypqC7X{}}J)~&>1F?`=Al}a%%Fu>!- zj~B=lhVlIQ^A`B3Tw72G;z9xA8}nzSROZ^XYh^=Yt>x&^qoh(PQmGVY&YU5gPGgKI zGF}*(>({R%BAFnte+gTHpl}yfCF#2ysP{Z?Z6vbnQ?1pGvuDpPOD2;=vCi+pt*xy9 z+_`fH-}j4lU8U4~wmg0Ml>Phn`@o-!F{iDykAX?xWgbQqELJ5VF`!l{-6Z1PkHuoY z)>?1AaN&ZgtE(#uQ*P@ogqWI|qN}S*MC2P|{9fnmU0@8D0do29=#ow=0J0+P1u&A! zD9Mc5z(i}fQ# zHO2Eh-&*%b#I3)4`Eu>5RjYI|nIsmA&3|$Jng{eek8C!})vH(O>FEiabLqg^0pJ@T z155+2LJ+Ccp(&-cC(gxyS|9w21s&DfL7|z70Jw8A4=By-~W?l-83hN)Z;hAXJcX&W(hgsu7XpN~vYx z`trjpcp)OsfiV%80w$GG(;_lk&^*gq9Vf!}?gu~(@LrhaRpGPzIV~2TMIoeS9ZL*#KzC zd2Dk3{`^Z+nss{tO?(Wrv>&HIEKKz@3F>=kstG{K0mlFN;eQ9im#3c?{{MrAm;x}- zHBi;!n^E!t=sx=M^G_o%coqNt`uhPMZ%mB&pu|Tti`fM@3P3(W6F#7~_2mN~eE~^K z0GjwHw-}h9Ko*h`e+73EloTko7?_~ulUyosvG!ABF)%>|ASWo4e8|KIOU>A%1Armr zK$gYO1clS(oPWYx0#J(;aD-GnSr+3+P{=->{~$~KJRUU;&@4!N$puPKKo{S~=i(pl zzBBy&`G5N Z08qKGx)4JKFy#OM002ovPDHLkV1mVo?nD3p delta 522 zcmV+l0`>jX1jq!CNq_1|L_t(|+G70w|3AY(049b30t03-3t74zuS@`v{ZL*ZgKYQ$ zQjK6FHIBdBSm?mR&9NUv?CTFl9*y_|G!1H?rTxT+QPtu<_m>p_DFZB022eTb2lb0{ zGX*3>1?~fx0?^=v`4*<+!;9A+6eWz(KTy@jKuh~!mV&^UOMmw+fH0C00jL`4`S`S=YRVRfC=h69=#i&bO6po`RSXXfMMYUlFDiUUiN+zpP_*}4_|{VRFM~D zz-tBrgCo&F{pZGn1cv{A9DtYs8~*U|GsBbTZwo;f#Kxr#WCqwQVuJd?{#pSAX`%bb zg$0Jg{{B0_qFD^~$)D@J`&pQo9Pkwb51zhLRB&wmfPXirWyE<4zzGUpUCIP3uW$A^ zz}a}B1mpp*nG6gKczyiiV(WVjb`}9@R{B4F{`tV6UoD6?j_*8r{o&7FVEi!rqY4I@ z1u~Ohs($nCOW~1sU*_YBV-mp!a4Ut<7RYETbJXHdiwB*>009O7vacl(Z;n{200000 MNkvXXt^-0~f^x&|0{{R3 diff --git a/core/res/res/drawable/ic_text_dot.png b/core/res/res/drawable/ic_text_dot.png old mode 100755 new mode 100644 index bb02379498f66764463f280f30d4bc94de282b18..47913f66595a8a2f3ce1b059bfe29c0bb64ddd8f GIT binary patch delta 449 zcmV;y0Y3iB0^9>3iBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCpde*u0; zL_t(|+U%A;OT$1I#*^S6;vfb!VzG;8z#;*`!LQ)r?9fRN`e8bB=;YMF!O3rsO-Mm0 zf`cdoCD61f;w0(6#OEogXeoNaNtb)!;ga`#cz@ho?ueeIsWyu+v>Am0EAYR?++WPP zt}kHNgw~ic%r4w8rYq?x*iTNN1-f)4ms@3WRUa!#aK`J + android:background="?android:attr/listDivider" /> + android:background="?android:attr/listDivider" /> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index b7de997fd9609..0fd6861fd6afc 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -68,10 +68,8 @@ #aaa - #ffd57e - #ddb66a - #eeeeee - #c0c0c0 + #dd6826 + #dd6826 #7fa87f