mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-19 04:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix icon notification

Browse source
This commit is contained in:
Erwan Croze 2018-10-09 11:36:13 +02:00
parent 1b14f35ab3
commit d28b856b27
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/android/org/linphone/LinphoneService.java
View file

@ -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);
}

9
src/android/org/linphone/compatibility/ApiTwentySixPlus.java
View file

@ -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

2
submodules/linphone

@ -1 +1 @@
Subproject commit c2fe85847a852dfc7e3cfed449163de0dcf09f77
Subproject commit 85f8f93ee8ba2061f15434c713de90fca13a3088

2
submodules/oRTP

@ -1 +1 @@
Subproject commit 17be28e9d0b8e50b89ff9fba75990a51f03f111e
Subproject commit c9dde282bf48af9a8844f0686a09a1d0347e6856