From 6e28c381c4b2f66ea37596faa1da3a3a1615a2b5 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 11 May 2016 12:12:40 +0300
Subject: [PATCH] Update icon for "New -> Kotlin Activity" Action Assets were
 taken from DSGN-2829

---
 .../org/jetbrains/kotlin/idea/KotlinIcons.java   |   1 +
 .../android/actions/NewKotlinActivityAction.kt   |   2 +-
 .../kotlin/idea/icons/kotlin_activity.png        | Bin 0 -> 1254 bytes
 .../kotlin/idea/icons/kotlin_activity@2x.png     | Bin 0 -> 1674 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png
 create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
index 0cc19eb09e7..0b2e6255b33 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java
@@ -30,6 +30,7 @@ public interface KotlinIcons {
     Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.png");
     Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.png");
     Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png");
+    Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.png");
     Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.png");
     Icon TRAIT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png");
     Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.png");
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
index a94fa730ccc..5ed6dd8b369 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
@@ -40,7 +40,7 @@ import kotlin.reflect.memberFunctions
 private val NEW_KOTLIN_ACTIVITY_START_LABEL = "Start New Kotlin Activity Action"
 private val NEW_KOTLIN_ACTIVITY_END_LABEL = "Finish New Kotlin Activity Action"
 
-class NewKotlinActivityAction: AnAction(KotlinIcons.FILE) {
+class NewKotlinActivityAction: AnAction(KotlinIcons.ACTIVITY) {
 
     companion object {
         internal fun attachGradleSyncListener(project: Project) {
diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity.png
new file mode 100644
index 0000000000000000000000000000000000000000..0983f99ac3e4ee2004792717c0a506964dd7c7eb
GIT binary patch
literal 1254
zcmaJ>duSVV9KWPXQ)=tFv8Hqr`r}%4!zTA=k~T-u=5eVDni$fU_K(4O$^Fut-937D
zZPHpL^F_x%io(Ex3WMoj=qf|}!$-Tam8q>(L8QYnOvMKZ20O;I&U%+M(Lam_cfSXp
z&*%I4aHpb?ha2k;)*}eg7&=PFw6#fp>uR-c+tv=FEv;&BNF5N<YL<~9;$y`m1R<Uo
zficLilVcx4H-gkWz{Q8uq41+rO5|;fj<Mx<Nn<03yDuj(sZpqcBpl%c5Blr-3n<`N
z4?5@w<6$WPGu+WB84gTE;;E_8l#50CdVxDfX#zY{8Ia>o2nv<+pe0>O+w0dD3Q7=l
z)PvqlYA7590a1p)VRKqj1VMmqmyK}rbdiouK;nc0!(AAGTXBLSaEipi?t^O4WHwF3
z=>FYU+R1}vR8^udESt^RvRyV&9>EBg%Z1@2Mv_(yVO1stmC0EJrM;{`LnS41lFEq!
z&=r}aIIen7Ez`Rt@KQxqP<Gp-H4Mu!5=Pi?y`(ZQ9R7bO&sWfj8iW7j`=7!}d{Tl~
z3@YNdoYDrDZr4LeR6vG|D#~$DJW=jqG$X2_k`W~k2$Z@84i9nyD`u4=B~Ca@g#<-q
zgcJ<X9#m7YaU4sLE_=5#;Or;tPMjcu&K{C<^asc;e~;bQ<MYvFE-j|Uc_^r5E?ePt
z<5ju39e7ELOhcKQfNZ}k@}N{U#Z}LRuBx}oWvk}m3|8f0S~8eE+<y(be5E-^-&U-v
z9V+IBg64Qxvv%<-;x_~_Bto<=p1Yp>b7!ZormmA3UCr<L%s6IhI&Mx{K*CV40jEE4
zU}XA0=c&d{bAgYpf?~_eh4~}w5}Iy&{MgBk#J$Z5Sk6xYOa4oIt?tTnCOMq{#Wec{
z=KWyL%-4nD^+Av}CnMmmys&r(M2v-AU|D7sA31;Fhs!t7Cr`G{{QgBl(0pIiv2uGU
z-?8X_Zf<|at;axb{r-Dye0sI0Tzu#S!_NFGv)eyr_RgHSy>*7!d>O61dgF8NH?M`=
z6Xw|ui<Y_Eyz$$Gw$_B_tvr`TxLe!uwSDWzKJd}rD{rnjw(e|yGGE~Ce|Gtz`S9GB
z>FlAV2fgd(ywlS9r6+3dy#C&0<0X@^ZOOiQ`uU%uf7qKA@a?CYSAMd*m^yD+eW_(&
zV}rhyZ&^d0GK61k*zmtI++cdw8#q`DZnj60hG6rtuC<Aq?i%}decrqQAx|?a#_!qV
P`kyBhjL>iUhoAWy09&lL

literal 0
HcmV?d00001

diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_activity@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4dec6d4f8f405f67b102ed7fc509cb19b3078217
GIT binary patch
literal 1674
zcmaJ?Yfuws6b(@$!BVgV>x;TB5+6V|8%ZFMU`duo#LyTJgH|LYi>#1ry1S47RfHf)
zhbpBlbsR)Rqz<Bms>n-_wxS(zP|Ltz(P;~UQ*eM5)PRp}5NLmt?#%A@n0wAW_uezJ
zxytYmM~9^j3<kqd9*U^w6|lYbEc#2PrH#_d5-LbdMd0z2NkgEFKph^30&=}(H>yH4
zy3~(<Lj4(xIUFofO{o=|#adj?)!1UVX1$R{GZ_9G%|?wj5v71QbT?*@fJ607Ab{y4
z;5LDRr!dOU1S~X-KqJz^BeiLXT9FRi7y$U2#WaB)r8Iz9pJX7#W(hdSE2j6hYX}4;
zL#RXv_(qgkp#)?&fdT@q&|3?`FyJfV!UDhbe1R9h=fMJqCxT#}HxCxWJTadKOg$i-
zjnKu5RY>quF8U+^6DZ0kh9Hy4#5Jww;>2zU7Kua<j}P(r-gJaFnQEXkW^V)OKFxrj
zq?W*p6owlB8>1!;Po^Xwt@KR^dgBbOft+d+-7v_kF+wnxXDewsP@(w$P`!R8nxs_d
zKYIU@n2by{qL2zD@nk|v4=&!_mdYrW5vYd3iAWqzn(m@90jF>>0XG6N*<{y%HQO+Q
z4mXi&Cou|zSZ*LGjX{gb5eZ1Ma4}3LUN7~7{elC7VILt6hJ%DsA1Pldgnjt1uaLfy
zPGb>Vo2*9-)HGH%gO&1T#oFwkH`19Al)zF@T`+;`fyuJP*z8)6S^1{0x>>aZ2F;3v
zXfcp&xc?gV^cC$O+jhpf^kK&QsDXAoL0dbZ=0zBT!5o((fsy9>gJ16qb=l%_qpi0f
z@f@63XpKFIdFDg~AFJJKFL#pY7LNg=>uyH<e&Kn$Og^eaoac^}1+IwAl4_!@I~RJ5
z7aUb)0$Ha^_GZ@C{hZM;kYXz8>N=7eBOcZcwH96NZ+g}(dR774;=c^Lcox5u>IqtX
zvv#mZp=B9xvfsGxb!8)C&V=1}%`R)02LN`SWlKK0G04GC!(?@^V=PqunKa@2zUC@5
zr`y?r+dZCNFUaz&p4V$xS=pInCyHhGU2C)7*K~9!jMMI7_i3B9(lw8<VL@rNN8vHJ
zZ(`Lkmk{?~SFJ&N;&}E#?74>}pm1HBr}6$<c7kqo*9f}s6Q}aN3Rw0*G&8yEPF`o_
z+lR!dzWiPO%#SJxuFm=9np@$7Ym{!(Yo5B9sXjM!BGALkdYZ{GwuN4E6>jl(7a*)x
zLPpL785$fTE$)Nkb=&uMydT=%f^mv`Uo3x$tov<O)oZ2~=XTHC+HV^KE1vhi$2pj3
zWqz59?@3ur>U)bboa+KYwytb4?68(ZIcy%d`$uUwaogV`I%Y*MJLburg_q}UCVPfP
zSQ|aZB7TURZ!J9EyQ3;6_i?qG1FQ3w>`t{{0CiKgrbw5bDuXhz{sN;cyIkF$WY*`^
zw65J-(pSa(GrD4+c&yY-?cY=9)iS;)G&aPiIjmGp9BBkHRD5>%`S#U|p!S&2AGfj}
z#I_7~AOGTUf$0$Q*0S0&AF>apUzaSn{Mq~I4F^Io<jTb|GQa-ySC?a!#8y9?_&l4z
zWF=`*@!RDkISu0@i07%+?S@x=QBmlkp{9F>p=jsUBjgRJGzal-O}Y27yQeuEBM-jl
z7*q{9HK`pNpLP{TY&vfZe|Tm&nA7Uw+;Ma~`;v0_!ttQdvnP>(4X(~`{-OQY*5gjz
z`%kDWU~zw+vfdrKxBTGB5-7&*N^^EW`kn6|WDJE2Z>wF>{^(|2eDP`LQ!e6n+B4c5
rU%4f^Nt@fs*#+q-*Na+wo8~QM4EPMNHa+6h*!~Xkpm5}ZG&bvRm1Kp_

literal 0
HcmV?d00001