From 50ac757cc35840864fe2bc69ce58dfef15732bc7 Mon Sep 17 00:00:00 2001 From: Sergey Eremin Date: Mon, 25 Sep 2017 01:13:08 +0300 Subject: [PATCH] Cancel icon made consistent throughout androic versions --- .../yeriomin/yalpstore/InstallerAbstract.java | 2 +- .../task/HttpURLConnectionDownloadTask.java | 2 +- app/src/main/res/drawable-hdpi/ic_cancel.png | Bin 0 -> 280 bytes app/src/main/res/drawable-xhdpi/ic_cancel.png | Bin 0 -> 380 bytes app/src/main/res/drawable-xxhdpi/ic_cancel.png | Bin 0 -> 476 bytes app/src/main/res/drawable-xxxhdpi/ic_cancel.png | Bin 0 -> 627 bytes app/src/main/res/drawable/ic_cancel.png | Bin 0 -> 247 bytes .../main/res/layout/details_activity_layout.xml | 2 +- .../layout/manual_download_activity_layout.xml | 2 +- 9 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_cancel.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_cancel.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_cancel.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_cancel.png create mode 100644 app/src/main/res/drawable/ic_cancel.png diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java index d49e66c57..7f763b861 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java @@ -128,7 +128,7 @@ public abstract class InstallerAbstract { ; if (new BlackWhiteListManager(context).isUpdatable(app.getPackageName())) { builder.addAction( - android.R.drawable.ic_menu_close_clear_cancel, + R.drawable.ic_cancel, R.string.action_ignore, PendingIntent.getService(context, 0, getIgnoreIntent(app), PendingIntent.FLAG_UPDATE_CURRENT) ); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/task/HttpURLConnectionDownloadTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/task/HttpURLConnectionDownloadTask.java index ef359b9d0..4637c95c2 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/task/HttpURLConnectionDownloadTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/task/HttpURLConnectionDownloadTask.java @@ -128,7 +128,7 @@ public class HttpURLConnectionDownloadTask extends AsyncTaskHfYNW|f{(>(ba40xD1&;GyPBOntoJGbwnXmyK*=U$z)VXIxU zJDyH>_-MsCHuusU7Hpnn#|sLVsaVR0z1*^L39tX-SygYgu~`HccNlMEx7^=o@LYY; zgPOLWIsFlnK65Rz?9XT{=ALdbePhx2>8`8xp6?EMaK}USTx-aa1cit8g5?>kLSLPO zl%05Wx4Nx3>b5p2>u2zF!BWSdaI;XQ6;aKix@&$VrcPOXJSH)JYt-5aW(;RJ4)@)g RbROt_22WQ%mvv4FO#u5@Zpr`v literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel.png b/app/src/main/res/drawable-xhdpi/ic_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..52d09a7a819a8a8ad7e82533cd93a56c9bf1b565 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#h0(?ST8yXti3w#;8U+`}R<6PA_{Vy397^OX3978hhy`6EJ>yQJFOZw;k@@qRh_ByCX@~!AOU+A~n z*KBgeL3>sK2L?tKAW_XQb$!q)W|jE?*B|IPeBvzSe#Z#pe1E_PGSpPeSwde&Fm*H(|n{htIab*eN$TMlj)1x zT5oBTu4P=fu>PKreMjk+-g$r2u3svj^{+d@|9+9E|0Lhq^V?)xXa8EJziQ*Y>^)hl z@~wAEz50D^W7;p?{3zwW`b-zxUFuV;d|x^(UeEPw)8h5nyB=Q9ot*b;OYXv6@m$%= z&)&Dos~8r#YgBP8IUZ3Za6FvzhY?Hs^AFsbbxV)wv;N%rOg^WMnM0w0fr;b6bO!NL X7Zj#`;afTl7;Frlu6{1-oD!MiNA?&VlSl>=XMROq?YN*^S8Haf_oZX*d9`D$avz^BKH4f*_#yC-Q-8*fp5v`@ z7r#jMa@#I?Y%C^Tb%g)-hKW1A3T!;lzdA|emv@!vhf;aNqNaWktE286bDtQ?*qlu_ zs9JPB;77>(#vdo``ni3+S4Joud>%MaWIlW9q?$Z&ug^OpwJtsn+ZZxm`st)vJ?>?{ zW2WeQu+)uuR2;PJ#PaAJXO;)=y0AQQ&z0q+e^-Ca+~a=KF5K;>-E%ilyL2~GyV}KC z^XCQ5^}oI1((=@h*UiF$W^*f7{?@edrS3&n?*kZx?y& z_PRWacS{-1+CboFyt=akR{0CPy#!~g&Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..327543e1fbe9c49ca46f3d72ca7d4ff3e792bff1 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1JOMr-uI>dsjg5^BV6ZQ9-vXdG zb4ie2FoVGU*I5;l7#Ns@JzX3_DsH`B~-AQ=R4!KgOiOO&j`-g(f_!hv)->s|39}-&F^%TA0PewKYZx-|L}VLoCoLa ztq$(5&uUWte}m=xzfR7$Kgz;;el1s>@#DDaj9==i6`%XPKD?VhDdCvC+QB*XZcR6h z7&+To`Tc$^;_){~`J14pRl2a=YoqsH;Zw11jln?d`1CRXQ;34_HS*!IA|H&zz>=y)|sox%8 z`G2k#>)&$EsbB6d485{Ha?P6h#Zig>)plO`$6IyuuQ}`K-}xF$f5KG-|7p(>`2Une z2hZM&R1XYZvWH;`~FukHT{obYWrWr)ManS z@Hf2UpS#b0bFcqOi|>0~$ba@?`{gg}Qooc{|1O;OFRJxlQun{CiT{eG|Ero?cfip; zX_5S=i~W%=+3$V{W3JlFzV~k1y$>$=mW$2*Uc9aMvUmNLYspog&G-JDXUE_u@3@ek z@#66fFPaO!1iJh((5RJ}ZYSU?@3~x`^}zbn2l~ertXDgz-@cRg%U7E}te%sz8DavD z#tVHb;a!k@>qqw|x$6vjR!!Ki^XaqHf$ODR9ms%VCckE^v6CB%@*!YqVeoYIb6Mw< G&;$UX#wxo2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_cancel.png b/app/src/main/res/drawable/ic_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..e7fe42c31dd16b702cb9fd4b64aa39c5a049901c GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s`~f~8t_=+h?gc(TvazudNX|05 z_68`$S`y?J{Es0dYMG+--A6!yNuDl_As)xyPIcsKP~c(NzVv_nW)&%+#M?VM)tlUB zTx9ZY?d0#<&?wNWC^u7p!BB=nuSBlk(0(4D;LqmM93wK@Lc== literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/details_activity_layout.xml b/app/src/main/res/layout/details_activity_layout.xml index 5adeff371..bee6c78de 100644 --- a/app/src/main/res/layout/details_activity_layout.xml +++ b/app/src/main/res/layout/details_activity_layout.xml @@ -622,7 +622,7 @@ android:scaleType="centerCrop" android:visibility="gone" android:elevation="2dp" - android:src="@android:drawable/ic_menu_close_clear_cancel" /> + android:src="@drawable/ic_cancel" />