diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 84408a3aa..c4622f0f8 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -421,7 +421,7 @@ class NotificationsManager(private val context: Context) { context, context.getString(R.string.notification_channel_incoming_call_id)) .setContentTitle(context.getString(R.string.missed_call_notification_title)) .setContentText(body) - .setSmallIcon(R.drawable.call_status_missed) + .setSmallIcon(R.drawable.topbar_missed_call_notification) .setAutoCancel(true) .setContentIntent(pendingIntent) .setCategory(Notification.CATEGORY_EVENT) @@ -453,12 +453,16 @@ class NotificationsManager(private val context: Context) { Call.State.Paused, Call.State.Pausing, Call.State.PausedByRemote -> { callActivity = CallActivity::class.java stringResourceId = R.string.call_notification_paused - iconResourceId = R.drawable.topbar_call_notification + iconResourceId = R.drawable.topbar_call_paused_notification } Call.State.OutgoingRinging, Call.State.OutgoingProgress, Call.State.OutgoingInit, Call.State.OutgoingEarlyMedia -> { callActivity = OutgoingCallActivity::class.java stringResourceId = R.string.call_notification_outgoing - iconResourceId = R.drawable.topbar_call_notification + iconResourceId = if (call.params.videoEnabled()) { + R.drawable.topbar_videocall_notification + } else { + R.drawable.topbar_call_notification + } } else -> { callActivity = CallActivity::class.java diff --git a/app/src/main/res/drawable-hdpi/topbar_call_notification.png b/app/src/main/res/drawable-hdpi/topbar_call_notification.png new file mode 100644 index 000000000..ab24cd5c1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/topbar_call_notification.png differ diff --git a/app/src/main/res/drawable-hdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-hdpi/topbar_call_paused_notification.png new file mode 100644 index 000000000..8718035ef Binary files /dev/null and b/app/src/main/res/drawable-hdpi/topbar_call_paused_notification.png differ diff --git a/app/src/main/res/drawable-hdpi/topbar_chat_notification.png b/app/src/main/res/drawable-hdpi/topbar_chat_notification.png new file mode 100644 index 000000000..975acd34e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/topbar_chat_notification.png differ diff --git a/app/src/main/res/drawable-hdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-hdpi/topbar_missed_call_notification.png new file mode 100644 index 000000000..8f4ac5aed Binary files /dev/null and b/app/src/main/res/drawable-hdpi/topbar_missed_call_notification.png differ diff --git a/app/src/main/res/drawable-hdpi/topbar_service_notification.png b/app/src/main/res/drawable-hdpi/topbar_service_notification.png new file mode 100644 index 000000000..f4c3cf5c4 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/topbar_service_notification.png differ diff --git a/app/src/main/res/drawable-hdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-hdpi/topbar_videocall_notification.png new file mode 100644 index 000000000..acb444856 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/topbar_videocall_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/topbar_call_notification.png b/app/src/main/res/drawable-mdpi/topbar_call_notification.png new file mode 100644 index 000000000..adf504c79 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/topbar_call_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-mdpi/topbar_call_paused_notification.png new file mode 100644 index 000000000..63fff65b9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/topbar_call_paused_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/topbar_chat_notification.png b/app/src/main/res/drawable-mdpi/topbar_chat_notification.png new file mode 100644 index 000000000..618d4869c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/topbar_chat_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-mdpi/topbar_missed_call_notification.png new file mode 100644 index 000000000..bdb453946 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/topbar_missed_call_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/topbar_service_notification.png b/app/src/main/res/drawable-mdpi/topbar_service_notification.png new file mode 100644 index 000000000..20cce4f92 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/topbar_service_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-mdpi/topbar_videocall_notification.png new file mode 100644 index 000000000..87bce3552 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/topbar_videocall_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/topbar_call_notification.png b/app/src/main/res/drawable-xhdpi/topbar_call_notification.png index 2f0b96fea..eedae47f2 100644 Binary files a/app/src/main/res/drawable-xhdpi/topbar_call_notification.png and b/app/src/main/res/drawable-xhdpi/topbar_call_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-xhdpi/topbar_call_paused_notification.png new file mode 100644 index 000000000..dc53b1382 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/topbar_call_paused_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png b/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png index 4f35ff4e6..b21cc706c 100644 Binary files a/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png and b/app/src/main/res/drawable-xhdpi/topbar_chat_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-xhdpi/topbar_missed_call_notification.png new file mode 100644 index 000000000..da9fbf0d4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/topbar_missed_call_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/topbar_service_notification.png b/app/src/main/res/drawable-xhdpi/topbar_service_notification.png index 6a9f2d327..8e3d1a11f 100644 Binary files a/app/src/main/res/drawable-xhdpi/topbar_service_notification.png and b/app/src/main/res/drawable-xhdpi/topbar_service_notification.png differ diff --git a/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png index e91df1885..ca72e9d31 100644 Binary files a/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png and b/app/src/main/res/drawable-xhdpi/topbar_videocall_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/topbar_call_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_call_notification.png new file mode 100644 index 000000000..ada072d3f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/topbar_call_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_call_paused_notification.png new file mode 100644 index 000000000..ef886c53c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/topbar_call_paused_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/topbar_chat_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_chat_notification.png new file mode 100644 index 000000000..c00ce5b01 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/topbar_chat_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_missed_call_notification.png new file mode 100644 index 000000000..c75fae050 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/topbar_missed_call_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/topbar_service_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_service_notification.png new file mode 100644 index 000000000..89ab907d9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/topbar_service_notification.png differ diff --git a/app/src/main/res/drawable-xxhdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-xxhdpi/topbar_videocall_notification.png new file mode 100644 index 000000000..1e5a1abb8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/topbar_videocall_notification.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_call_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_call_notification.png new file mode 100644 index 000000000..130558d24 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/topbar_call_notification.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_call_paused_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_call_paused_notification.png new file mode 100644 index 000000000..16c60ecdd Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/topbar_call_paused_notification.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_chat_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_chat_notification.png new file mode 100644 index 000000000..144d25d0c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/topbar_chat_notification.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_missed_call_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_missed_call_notification.png new file mode 100644 index 000000000..1eb46e47b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/topbar_missed_call_notification.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_service_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_service_notification.png new file mode 100644 index 000000000..bb12c773d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/topbar_service_notification.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/topbar_videocall_notification.png b/app/src/main/res/drawable-xxxhdpi/topbar_videocall_notification.png new file mode 100644 index 000000000..23184c99e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/topbar_videocall_notification.png differ diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml index 1a473e5ad..e60f28f3c 100644 --- a/app/src/main/res/layout/settings_advanced_fragment.xml +++ b/app/src/main/res/layout/settings_advanced_fragment.xml @@ -97,6 +97,7 @@