From 8d90b3fbf160650135fc9658b753e39bb56f1508 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 22 Sep 2015 08:50:54 +0200 Subject: [PATCH] swapped icons for foreground services --- .../conversations/services/ExportLogsService.java | 3 ++- .../services/NotificationService.java | 4 +--- src/main/res/drawable-hdpi/ic_link_white_24dp.png | Bin 0 -> 430 bytes src/main/res/drawable-mdpi/ic_link_white_24dp.png | Bin 0 -> 297 bytes .../res/drawable-xhdpi/ic_link_white_24dp.png | Bin 0 -> 494 bytes .../res/drawable-xxhdpi/ic_link_white_24dp.png | Bin 0 -> 670 bytes .../res/drawable-xxxhdpi/ic_link_white_24dp.png | Bin 0 -> 865 bytes 7 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_link_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png diff --git a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java b/src/main/java/eu/siacs/conversations/services/ExportLogsService.java index 41b346994..8501c04ad 100644 --- a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java +++ b/src/main/java/eu/siacs/conversations/services/ExportLogsService.java @@ -4,6 +4,7 @@ import android.app.NotificationManager; import android.app.Service; import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.IBinder; import android.support.v4.app.NotificationCompat; @@ -48,7 +49,7 @@ public class ExportLogsService extends Service { NotificationManager mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getBaseContext()); mBuilder.setContentTitle(getString(R.string.notification_export_logs_title)) - .setSmallIcon(R.drawable.ic_notification) + .setSmallIcon(R.drawable.ic_import_export_white_24dp) .setProgress(conversations.size(), 0, false); startForeground(NOTIFICATION_ID, mBuilder.build()); diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 187009167..4fd7fde7c 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -497,16 +497,14 @@ public class NotificationService { final int cancelIcon; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mBuilder.setCategory(Notification.CATEGORY_SERVICE); - mBuilder.setSmallIcon(R.drawable.ic_import_export_white_24dp); cancelIcon = R.drawable.ic_cancel_white_24dp; } else { - mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export); cancelIcon = R.drawable.ic_action_cancel; } + mBuilder.setSmallIcon(R.drawable.ic_link_white_24dp); mBuilder.addAction(cancelIcon, mXmppConnectionService.getString(R.string.disable_foreground_service), createDisableForeground()); - setNotificationColor(mBuilder); return mBuilder.build(); } diff --git a/src/main/res/drawable-hdpi/ic_link_white_24dp.png b/src/main/res/drawable-hdpi/ic_link_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4186e00c65efa5a0967f4ea730d76ae971db5182 GIT binary patch literal 430 zcmV;f0a5;mP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00AaRL_t(Y$L-X=E`w1R$MI9QAtDW9)3J==3Iqe8H&C%^ zn$lEalln6egG(Z!LUfXd8!%9VkHMRI-|E}6Vi4)`+n)2w_vD=CPY`}bVFVh1{xT?| zV8gDxj^+iyoO(w!n`UMDftIv%M_mxqzvWw&(?ExMMH&c>dx0v^;iZZ-D;?zoK`xeA zwdEpmSGqx2ZBXuhdx|p3plvD%+6SjYRq6~JBtcCu5wq1(^yQcYH%ZVl9uxPaMcng* z*CeQohaZ7nlAv3>8z1UvSO=~G=WkLc z(9^{+#NzbZ%hp_n0t8wg8t$-i>{*d5lyheie}Sr)*dk3Kmf7bI*{HNE=$KnP>u|yU zhdhUQKhAu_-;%h}yrH#u_bR6=|I*TLv0YOr))8IwO)_FHQ}LW$9;;-Yo>+s-23xni zr=UB#4Awo>%4auZHfZVvc|L!9004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Cx6L_t(o!|j&OYQjJehZkG?6U2ur8jwh#Z`6W^_7xNh zz4RdX20aw?5D}H2ZQnqMP`(~IiMs2mi57a;ncL3n?;Cb@CsC-sb>#pK-~bNr?*Z4E zUkFg1$xT9i%!1bksL8z8YI{$aosPaLvi0Dv|HJK%9EamA1~&67NR zeZ*=9VF5JLl#n{bOwBCfGfDS1_5sR#O86Bo*Ojc&7lp;9yiNEvt=`Lh>#IyfB`^Wc z5~`o|umVx(nt(`JtDpTb+s&>J128uMYXF8uP1yj75P;YQ7@Z9m+W?n2B2NmPnSh>b z@Xu;;OH?{0APG&V=9aH97nP<7D6y1aKPRHbKop{V4^82x=Q<^zl1bd7l~xZowqe)a zYFeHHG+5*YMB9gB|6~>k=rWf_e+nRGMu+CU k5%2zs9KZn_zyU7dKls~msmmE-KmY&$07*qoM6N<$g8TKuHvj+t literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_link_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8e96c356b9ccb2f95ca4a19351f7e6fbde6cd386 GIT binary patch literal 670 zcmV;P0%84$P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00I_CL_t(&-tE}EN@GD3!0}){tTZH#rD$Q1!d=)PB0hu! zQBv3$jNtAQEEbD}Y0?J;n>2oaXelO&eU$jOi)Ze=bMHj&gjLR&_RP#L+?hEu$&mTK zT1G(%Qjmfaq#y+;NI?qvzM!0?O%ycE5(k{|#1LD^d|N!z=Y%~L$bTGErp^<|;R1S( z2R12w1oV?f++sWsz&(}mKso;49^-=mnq*x;S^j}{5FAF4qCmexU0>+Z;>gluUt3O# zE-#^R_gz5CfllXCnMq|!&$7Z*VDw57s6=0+52>Ym&g9wR)mYxec+j@N`Qha>t{S9T z9H?My^_sT=Q8&(|ydAV?teu=UP=RYP)4Uzj6lqnjMRZNf)Ubn2MeVWetZ^fHl#-~8 z9XsfKhjp#LEgevXi%~|;4tgFXwY-Dcqm0290!{LhUAla-6H&cpy@JYai+WECwBmK! zuZx*>?Vtsbc9nG5{6w4PR?IXPS2`X<;+8kij+muyR)k>crbvC|mlw{evBoyyt9_As zgH)%G^2gdSICsH{5bjb5?2>END5Ziav(8Om^d*-oY%{cVhg{I+*wSQQTTYwHh?iZ% z^^$)$kxTwxrd*#vS@yky8d03MhhoK8-sytw!fVInDP5#yoJ;9|`fS9#Vv=78^EBwt zWAG`^fF2!onM=AD>mODMQjmfaq#y+;NI?ox&^H6U0nXoj(Vkup6aWAK07*qoM6N<$ Ef<_K1*Z=?k literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_link_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..df2faf36d077b7774d7e7e773ffa49a861d1cfd3 GIT binary patch literal 865 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s zRB_YO#WAGf*4vwB{em4u4t(U&WeaCp)ETic(Yr~_so-Jsj01;$@U`e=s1~+9I@HUu z#_h$j(`=KqJZt;fS~)u}F?B8xc2q82eQ?8&uP z*uwo^D*k{K!!`*XCXW^_doPBXvU=`!4gBlwz70@1Z|xlV+ck-LUOb00D~e}z z9Amjf@T@xZn;%Vbr`W1?u_@nUSihw|{f^hN%K5>nlf>f~YGpLeK3k)DT2ghARQQ>O z_FE@}x3fuHuv@HY{9xv#lzXq5Tx;1SjUOz&bj0LcyYAa+f6Z|5vkkea*LovakF3}h z6KlvEwS2>*QisTy=Xx5hSt{hq1_VsA{BOVDx&6Yt-<{cY^^bg?vU#plYl|@Tk_;=FG%vf2Qy-%l;}A-`da4 zxAR?kbn3O#>lV(hf|})(SMw@8f4cF0@7g)9uLLjkX)FZ?Z2W>Z8-y=@`<%(&vH7ZL zbhqlS=A3tYZAvce8mzbP*w%ArUt`pM=YRh;<8hwS>;~uU@z?JQUKUu*clcH+v(%nK zIg4i5PrV;Dos|$YU2tmBbP0l+XkKy>V<+ literal 0 HcmV?d00001