From 3244e960286fcce09ee5c1fe7d646de1cd693758 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 27 Sep 2012 13:50:34 -0700
Subject: [PATCH] Fix issue #7242119 and #7242008.

Issue #7242119 Permissions UI: "may cost you money" text color in gold
Issue #7242008 Permissions UI: add coin icon for permissions that cost money

Change-Id: I900b89e96f0a5ae6b686deecdab38d150d39b202
---
 core/res/res/drawable-hdpi/ic_coins_s.png        | Bin 0 -> 1100 bytes
 core/res/res/drawable-mdpi/ic_coins_s.png        | Bin 0 -> 741 bytes
 core/res/res/drawable-xhdpi/ic_coins_s.png       | Bin 0 -> 1483 bytes
 .../res/res/layout/app_permission_item_money.xml |   7 +++++--
 core/res/res/values/colors.xml                   |   2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 core/res/res/drawable-hdpi/ic_coins_s.png
 create mode 100644 core/res/res/drawable-mdpi/ic_coins_s.png
 create mode 100644 core/res/res/drawable-xhdpi/ic_coins_s.png

diff --git a/core/res/res/drawable-hdpi/ic_coins_s.png b/core/res/res/drawable-hdpi/ic_coins_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ada1d00810359137bc726ab39fe6cd805f85c3d
GIT binary patch
literal 1100
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>WGgtNdSvY3H^TL^?1FWs&C!@$7w!_&nv#N+tftKJ<kt|Dv?-ru`D
zS#rMMqz;Xa{sm4w3)X5h>8V@{z0k{Dx_E~`X{LjsM32TUg9RN;KbQ)iDrtwCX&n?l
z#uEN<qGRA<i4z=di+zsmtBt*~^5v^-g2@M;iiIve_kVu*Ro-6#3*EHWmhO<6y+QF@
z-y?-@kEdH?8#u9Fy~eyOT$G`dBd)W(!1x+_!A>ikhq7;uJ!ibMPHPU+O6QXt)*JcD
zMNhd)95e6Q{8e$Y{=F^69X<>t6+FA03M@+Rcdyqw*RHsmyT84!O3VRh)9eqLe%#ZH
zS<~0(?3P*gSF2-<(3)*>0gtx@+?&_(Dd(;L_YJedZ+AJy_Xc+{{JUSu_U<t6v5l*Y
zZtXs}#L{zu-n}^--)%a-fAC@`TamS=-@KRk&Oi32YYP{|A9Gt-7FMADt>yOaD6J*7
zj7I5mB6Ard-W4A^^U!pqm>lneoeVoUZ*T7Idz4et&Hgd*$Hs}97R|iX{~^%8w&VHZ
zb==)mjAiO#tMV?ae^g|>?s(jvw&H@g25zPHkHtTJ^i7!0k;S;BrB`xid-?|E^N*}`
z9vu&eNw)LZuk|Ol?NiOQmeS*!ZaT00|AuGbeP!i&zosiZXS1xGcm17Av(6uuYY+5u
zjz#XUmw0+yTdn&13Xg_4+niT^l?gJ~ArXGWZui^7n6BH(A4&x>lIHJUR<YUK<7~3-
z<FZ=8eI4C0OU&fnAAfD3cedSoN#8DouM1UIUJxtPTX)pELb}v%<x_*qV!<VICe>#C
z_#-e)=h%P#l{2nAbjmq6y+UErTF2Rp>kc2EI7_-mI$q92d5-+f*mXH?7c$&!RPIuo
zlKeq(-NERCTV@6+HI*wd%{{Nh^TBhEWm3_Xbz#pF_jE1)$mVyvH)!En%>$c`9{<=I
za#6gcdfSv`PcPoozVk83pqlT#x9<k7YoCvuEnr>#$mfpmn(eL&HhUj;nCRMd`t%2m
zJl>=G-Gp@7AF-}<tLw_CRAkz>YLCpHy-Ygk=dbUGer3M>LDA&RkNj%{-kmJ`!Tx#A
zKej*5?%PQ}WSI!e7@{Sv5hcz=sfi_-`FRQ<nYpP9mik7f`i4ekf2J%0Do_O}NJ%V7
zwMqu5N@XxIFf`INu+%j&4KXyeGBCF?HP!`^1_mXi2bfSa<mRVjrd8tBz^YNP52!%~
xWJ7R%T1k0gQ7VIDN`6wRf?H-$YI%N9cCmtUuxa7e$7Vov44$rjF6*2UngICu*c$)<

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-mdpi/ic_coins_s.png b/core/res/res/drawable-mdpi/ic_coins_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8fd8abd5277e2ae61becdfbdee85a8ec89c3ca
GIT binary patch
literal 741
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvY3H^TL^?1FWs&C12lf3r;B5V#p%+^w%H+x0;~_7-`oAs
zc)=o$MPgb@gl3ygh+xtEBEMu4mspc;j?N#(s9P&rd;c-#-c^cP(dxpo)nHLapuj{?
zmkVz;RqK9>+2J80@$Bhei{fWz_PE}CJxwCn`rJdFzL__w*E~?HTfB3%#cnREn==l}
z%DDF`F_=#K$R+-94KEW=>AVBUZ;qXK7WOb)XzxLhwx%-6{`Q?aX7U^Kdh4d8GH=+N
z`1t>|Id6}a&he5=oq6m3mM;>j+pY({NahU>`XqEr_1+^hyVk&|H@=nc=sc>@Bt7Hh
z1MYckN9AOE_KNO%T<kEdK;vuwqT4xv-*-8E<ovcY)ZM94JZ*zLzjXdCqx%;kkL8%{
zPh$MMcIJxW^*%BW#p28vxH~Uf$S3l<zh%BL&HZo2wl;AMsRsGZ!x#2;J(qmk+w)Ou
za-n|Ev)U_jWxi~jx904GGe>W4>)ZX&E6V7A_nc$yGQ8bd3CuO#<_{dDHwt@w-ykY}
z=^DT0@^k<CG75NCCt4(ZnkiL!d}gEToSf1G=Ke`Pm)Gz65+AX;_<#GEASPgpiI%uV
zlsFfqCYEI8=P86_=B6@O>KmEr8ycDYnX(M1Koz7QC9x#cDjB3ImBGls&`8(7QrE~d
z#L(2rz}(8zSQkhd7?hMA0GWu;kei>9nO2Eg1FJ^GKA;8}kPX54X(i=}MX3yqDfvmM
i3T~N2spa`a*~JRZ!KQ^<ADaQyF?hQAxvX<aXaWFS4<VTV

literal 0
HcmV?d00001

diff --git a/core/res/res/drawable-xhdpi/ic_coins_s.png b/core/res/res/drawable-xhdpi/ic_coins_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..13d134e6b64e2760f3c9ed505fe17d4c4a9853e0
GIT binary patch
literal 1483
zcmZ{kdpOe#6vuxt$>j1j%gp^QCCnycUUONqR${EEDZ`W%+nAAia$A(!DtaXqT9U#;
z5k-?JrHcyXGA&WB%$;h_yLbM4|9GGCob!FoIiK%y{ySV>AG{hE4h8@~jo|G?lB>~r
zZrUiXv5ARGaseH4-{%eh4F#%Fs*=3l5KF>)0QLQP-`2@6Z_+*hNVEWe^h^NwB_E|v
z13;V|0DKPt0OwKw&}Npm`C;UXjiE%m7a&`Y%8r{Q@`(!5J17<aRJW|>hPR`sQu(=f
zf|q+hprCq?kk2D)D$gB_*YKiX9nHZe_V%4rO3!f$MA?rES3-$6WY$C28DhQ#9IfN4
z0mlU(&nAkV;Bpe|EOzD+uNT2^pm-G+7F0I7GWUJCJu)Iu^T-12(W&6OwPTNK{~;e$
zx}4$~O7_K#b~+mj*el_?$Bsy|4d;`L4|^)^<G&aUsUk-@jODKq0yBv$aLq(%OVh)9
z&~b5aT~7-q*c4r)&(EF;y9d+AgiO-AOD1neJ!S|<n7lOb75yvxtr?b7n~Ke1wI%Js
z18<=FQ7e1O2rN$2G(Fr>m6yY=<Z=VgjQIw_>o!&?R}NYX<TrI(I}tiVW(WQhnL0s!
zds2m-f-HyrS&iU=t=iwFJ2$`3nD}T6i$2=?I!@o`e1{);^N$JsXLdP1cbHmF>G5YC
zYM0>e3=jH0^9je-!X{rExs{^ei%gai!piLBBLniuVtO0dF{c$yf^mqLdH9D3a`_?Y
zn1?7f8D{lPcC+Ey0ax}NK|;Q&%Pz4ZMF;VI1`AmYEzmkIU|lzG=1fpWbngEsIM&!*
zx~RaVqcG*^S!>PdmXH@+*fB#1>eepGnZKAgX@yGN=^JJ(n62lmIo?%owzFh^U)urM
z>*%`+D_nlkwRiWN#ZDF1)l0s@=TL;J-bufC_(`E^f@16(xJ7FtJuCSRlS%CD?*i`-
z6x$)S?jpr#+i}Feq?nYKqHZX@lVG^L=)D%#Ry0*OnsKEeO}XAChH6IA4R$UZKj;l@
z*q~a~EmgQm=t%P~G8}yXpW2P-`xJ+$Na~v!<_}E^1KRb*P;<B5NhI(I$5sdR_cfm;
zt>0ps+So=(%b<SnG5QwP2qflych@0m6$xYNe#CZWhdT0hE9RHta~w{3`HxjHiOZSD
zHUXiO@e{2v3p7T_o@J1<n7gU}qPLlVN4)3qq!IagZQ!(x%cY2*TH1?;_YAZ%|3SY6
zk++pFljn~Z)Qk1nbCg-=o#22rR(Q?>nfc2+1`!&2)hl_BsNYB`ez{+Oy=*y3NHEZ?
zZcDS`?JcPdIcf9&Z*pIMNbm8hONpJ<+?7Q-M@J-a`&>5DIb1ozb1>CYOU{y*`3&W!
zIKi7t(<1P7<3jQpKlrG67wp!tyPHbY#2`iUgL#^4-PEWHrK}W~A(Y=-GfBDcA}A|M
z_$bogt+e-=AM|<JdT>cRUic~hCbNvUj6yEvR>&?wBo4-y1N3S)7==#re?DBX-D36Z
zPHy*y?D<dg)ktNec%)L2S*{38&U@H^P~UOs>u)6|ANq|efzi5;iW*ZD3`!DvicQ!*
zj<@t0zoOedmDzqyzO{6b5cH?%7om<Q?{W2;6AVg-b@T;<3^D?n({Pz3f9&}p-8ZP8
zofMXKmG?|nu*TWO!V6{Ep$B?rbDR3ApYa{Fma4l}f;!@`q4im(dvx?g<LBb5zBZGr
zrxrW}sfI1NH-`srAmTkaHS7#tX;YQ$mzA0(OU<8cLw#CqpS2g#68jFnE3^-}EdNVT
zHZG9u8AGG8BN@>~0g+KO0Bwsv+1eu<rMwzBV7?B7Q`t1<uyu+CAnfcBHg;$m1S-HD
z<!rah8RcLjuXc9qxK4%t7@`>AkrAi<-=Jib@JMdZTfgAXh+xN4V`zYTI3tv1v^z3}
c7SD(|5o_e>k76~89pxNA!1;L9dxT{C3-1hx3;+NC

literal 0
HcmV?d00001

diff --git a/core/res/res/layout/app_permission_item_money.xml b/core/res/res/layout/app_permission_item_money.xml
index ab0d5328696e6..3fa4653938376 100644
--- a/core/res/res/layout/app_permission_item_money.xml
+++ b/core/res/res/layout/app_permission_item_money.xml
@@ -55,9 +55,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:layout_below="@id/perm_name"
-            android:scaleType="fitCenter" />
+            android:layout_alignBottom="@+id/perm_money_label"
+            android:scaleType="fitCenter"
+            android:src="@android:drawable/ic_coins_s" />
         <TextView
+            android:id="@+id/perm_money_label"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textSize="16sp"
             android:textColor="@color/perms_costs_money"
@@ -65,6 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/perm_money_icon"
             android:layout_below="@id/perm_name"
+            android:layout_marginStart="8dp"
             android:text="@string/perm_costs_money" />
     </RelativeLayout>
 
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index eba354b3e07a1..07d0d74162399 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -90,7 +90,7 @@
     <color name="perms_dangerous_grp_color">#33b5e5</color>
     <color name="perms_dangerous_perm_color">#33b5e5</color>
     <color name="shadow">#cc222222</color>
-    <color name="perms_costs_money">#ffffb060</color>
+    <color name="perms_costs_money">#ffffbb33</color>
     
     <!-- For search-related UIs -->
     <color name="search_url_text_normal">#7fa87f</color>