From d28b856b2758302cfab363d511cd1725a300c225 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 9 Oct 2018 11:36:13 +0200 Subject: [PATCH] Fix icon notification --- src/android/org/linphone/LinphoneService.java | 2 +- .../org/linphone/compatibility/ApiTwentySixPlus.java | 9 ++++++--- submodules/linphone | 2 +- submodules/oRTP | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java index 4ce946bf0..640b38d25 100644 --- a/src/android/org/linphone/LinphoneService.java +++ b/src/android/org/linphone/LinphoneService.java @@ -827,7 +827,7 @@ public final class LinphoneService extends Service { bm = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher); } catch (Exception e) { } - mNotif = Compatibility.createNotification(this, mNotificationTitle, text, R.drawable.status_level, 0, bm, mNotifContentIntent, true,notifcationsPriority); + mNotif = Compatibility.createNotification(this, mNotificationTitle, text, R.drawable.linphone_notification_icon, 0, bm, mNotifContentIntent, true,notifcationsPriority); notifyWrapper(NOTIF_ID, mNotif); } diff --git a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java index f3b8fe0ab..b5914c3ee 100644 --- a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java @@ -76,7 +76,7 @@ public class ApiTwentySixPlus { notif = new Notification.Builder(context, context.getString(R.string.notification_channel_id)) .setContentTitle(title) .setContentText(msg) - .setSmallIcon(R.drawable.logo_secure_phone_small) + .setSmallIcon(R.drawable.topbar_chat_notification) .setAutoCancel(true) .setContentIntent(intent) .setDefaults(Notification.DEFAULT_SOUND @@ -110,6 +110,7 @@ public class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setSmallIcon(R.drawable.topbar_call_notification) .setColor(context.getColor(R.color.notification_color_led)) .build(); @@ -131,6 +132,7 @@ public class ApiTwentySixPlus { .setPriority(priority) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setSmallIcon(R.drawable.linphone_notification_icon) .setColor(context.getColor(R.color.notification_color_led)) .build(); } else { @@ -144,6 +146,7 @@ public class ApiTwentySixPlus { .setPriority(priority) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setSmallIcon(R.drawable.linphone_notification_icon) .setColor(context.getColor(R.color.notification_color_led)) .build(); } @@ -159,7 +162,6 @@ public class ApiTwentySixPlus { Notification notif = new Notification.Builder(context, context.getString(R.string.notification_channel_id)) .setContentTitle(title) .setContentText(text) - .setSmallIcon(R.drawable.logo_secure_phone_small) .setAutoCancel(true) .setContentIntent(intent) .setDefaults(Notification.DEFAULT_SOUND @@ -169,6 +171,7 @@ public class ApiTwentySixPlus { .setPriority(Notification.PRIORITY_HIGH) .setWhen(System.currentTimeMillis()) .setShowWhen(true) + .setSmallIcon(R.drawable.topbar_call_notification) .setColor(context.getColor(R.color.notification_color_led)) .build(); @@ -179,7 +182,7 @@ public class ApiTwentySixPlus { Notification notif = new Notification.Builder(context, context.getString(R.string.notification_channel_id)) .setContentTitle(title) .setContentText(text) - .setSmallIcon(R.drawable.logo_secure_phone_small) + .setSmallIcon(R.drawable.linphone_notification_icon) .setAutoCancel(true) .setContentIntent(intent) .setDefaults(Notification.DEFAULT_SOUND diff --git a/submodules/linphone b/submodules/linphone index c2fe85847..85f8f93ee 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c2fe85847a852dfc7e3cfed449163de0dcf09f77 +Subproject commit 85f8f93ee8ba2061f15434c713de90fca13a3088 diff --git a/submodules/oRTP b/submodules/oRTP index 17be28e9d..c9dde282b 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 17be28e9d0b8e50b89ff9fba75990a51f03f111e +Subproject commit c9dde282bf48af9a8844f0686a09a1d0347e6856