From 3c39cbc830a84041516547a2b19fbcebfe365e5e Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Fri, 24 Apr 2026 16:54:38 +0300
Subject: [PATCH 01/10] chore: prep infrastructure for live notifications
 (#669)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 messagingpush/api/messagingpush.api           |   9 +-
 messagingpush/src/main/AndroidManifest.xml    |   1 +
 .../CustomerIOPushNotificationHandler.kt      |  18 +--
 .../data/model/CustomerIOParsedPushPayload.kt |   8 +-
 .../messagingpush/util/BitmapDownloader.kt    |  25 ++++
 .../util/NotificationChannelCreator.kt        | 125 +++++++++++++-----
 6 files changed, 133 insertions(+), 53 deletions(-)
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/util/BitmapDownloader.kt

diff --git a/messagingpush/api/messagingpush.api b/messagingpush/api/messagingpush.api
index 019e24b43..d49c894c0 100644
--- a/messagingpush/api/messagingpush.api
+++ b/messagingpush/api/messagingpush.api
@@ -86,7 +86,8 @@ public final class io/customer/messagingpush/data/communication/CustomerIOPushNo
 
 public final class io/customer/messagingpush/data/model/CustomerIOParsedPushPayload : android/os/Parcelable {
 	public static final field CREATOR Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload$CREATOR;
-	public fun <init> (Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public fun <init> (Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Landroid/os/Parcel;)V
 	public final fun component1 ()Landroid/os/Bundle;
 	public final fun component2 ()Ljava/lang/String;
@@ -94,10 +95,12 @@ public final class io/customer/messagingpush/data/model/CustomerIOParsedPushPayl
 	public final fun component4 ()Ljava/lang/String;
 	public final fun component5 ()Ljava/lang/String;
 	public final fun component6 ()Ljava/lang/String;
-	public final fun copy (Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;
-	public static synthetic fun copy$default (Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;
+	public final fun component7 ()Ljava/lang/String;
+	public final fun copy (Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;
 	public fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getActivityId ()Ljava/lang/String;
 	public final fun getBody ()Ljava/lang/String;
 	public final fun getCioDeliveryId ()Ljava/lang/String;
 	public final fun getCioDeliveryToken ()Ljava/lang/String;
diff --git a/messagingpush/src/main/AndroidManifest.xml b/messagingpush/src/main/AndroidManifest.xml
index 0a94efbad..6e3206260 100644
--- a/messagingpush/src/main/AndroidManifest.xml
+++ b/messagingpush/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_PROMOTED_NOTIFICATIONS" />
 
     <application>
         <!-- Transparent activity for push interactions 
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt
index b1c27295b..e27f3c476 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt
@@ -5,7 +5,6 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.media.RingtoneManager
 import android.os.Build
 import android.os.Bundle
@@ -21,16 +20,13 @@ import io.customer.messagingpush.di.pushLogger
 import io.customer.messagingpush.di.pushModuleConfig
 import io.customer.messagingpush.extensions.*
 import io.customer.messagingpush.processor.PushMessageProcessor
+import io.customer.messagingpush.util.BitmapDownloader
 import io.customer.messagingpush.util.NotificationChannelCreator
 import io.customer.messagingpush.util.PushTrackingUtil.Companion.DELIVERY_ID_KEY
 import io.customer.messagingpush.util.PushTrackingUtil.Companion.DELIVERY_TOKEN_KEY
 import io.customer.sdk.core.di.SDKComponent
 import io.customer.sdk.core.extensions.applicationMetaData
-import java.net.URL
 import kotlin.math.abs
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 
 /**
  * Class to handle PushNotification.
@@ -226,19 +222,11 @@ internal class CustomerIOPushNotificationHandler(
         builder: NotificationCompat.Builder,
         body: String,
         defaultLargeIcon: Bitmap? = null
-    ) = runBlocking {
+    ) {
         val style = NotificationCompat.BigPictureStyle()
             .bigLargeIcon(defaultLargeIcon)
             .setSummaryText(body)
-        val url = URL(imageUrl)
-        withContext(Dispatchers.IO) {
-            try {
-                val input = url.openStream()
-                BitmapFactory.decodeStream(input)
-            } catch (e: Exception) {
-                null
-            }
-        }?.let { bitmap ->
+        BitmapDownloader.download(imageUrl)?.let { bitmap ->
             style.bigPicture(bitmap)
             builder.setLargeIcon(bitmap)
             builder.setStyle(style)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/data/model/CustomerIOParsedPushPayload.kt b/messagingpush/src/main/java/io/customer/messagingpush/data/model/CustomerIOParsedPushPayload.kt
index 3a1bcb21a..7b3774119 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/data/model/CustomerIOParsedPushPayload.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/data/model/CustomerIOParsedPushPayload.kt
@@ -13,6 +13,7 @@ import android.os.Parcelable
  * @property cioDeliveryToken Customer.io message delivery token
  * @property title notification content title text
  * @property body notification content body text
+ * @property activityId stable id identifying a live notification (null for standard push)
  */
 data class CustomerIOParsedPushPayload(
     val extras: Bundle,
@@ -20,7 +21,8 @@ data class CustomerIOParsedPushPayload(
     val cioDeliveryId: String,
     val cioDeliveryToken: String,
     val title: String,
-    val body: String
+    val body: String,
+    val activityId: String? = null
 ) : Parcelable {
     constructor(parcel: Parcel) : this(
         extras = parcel.readBundle(Bundle::class.java.classLoader) ?: Bundle(),
@@ -28,7 +30,8 @@ data class CustomerIOParsedPushPayload(
         cioDeliveryId = parcel.readString().orEmpty(),
         cioDeliveryToken = parcel.readString().orEmpty(),
         title = parcel.readString().orEmpty(),
-        body = parcel.readString().orEmpty()
+        body = parcel.readString().orEmpty(),
+        activityId = parcel.readString()
     )
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
@@ -38,6 +41,7 @@ data class CustomerIOParsedPushPayload(
         parcel.writeString(cioDeliveryToken)
         parcel.writeString(title)
         parcel.writeString(body)
+        parcel.writeString(activityId)
     }
 
     override fun describeContents(): Int {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/util/BitmapDownloader.kt b/messagingpush/src/main/java/io/customer/messagingpush/util/BitmapDownloader.kt
new file mode 100644
index 000000000..381c9729b
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/util/BitmapDownloader.kt
@@ -0,0 +1,25 @@
+package io.customer.messagingpush.util
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import io.customer.sdk.core.di.SDKComponent
+import java.net.URL
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+
+internal object BitmapDownloader {
+
+    fun download(imageUrl: String): Bitmap? = runBlocking {
+        withContext(Dispatchers.IO) {
+            try {
+                URL(imageUrl).openStream().use { input ->
+                    BitmapFactory.decodeStream(input)
+                }
+            } catch (e: Exception) {
+                SDKComponent.logger.error("Failed to download bitmap from '$imageUrl': ${e.message}")
+                null
+            }
+        }
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/util/NotificationChannelCreator.kt b/messagingpush/src/main/java/io/customer/messagingpush/util/NotificationChannelCreator.kt
index b49a58760..0928f1973 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/util/NotificationChannelCreator.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/util/NotificationChannelCreator.kt
@@ -33,6 +33,18 @@ internal class NotificationChannelCreator(
         @VisibleForTesting
         internal const val METADATA_NOTIFICATION_CHANNEL_IMPORTANCE =
             "io.customer.notification_channel_importance"
+
+        @VisibleForTesting
+        internal const val METADATA_LIVE_NOTIFICATION_CHANNEL_ID =
+            "io.customer.live_notification_channel_id"
+
+        @VisibleForTesting
+        internal const val METADATA_LIVE_NOTIFICATION_CHANNEL_NAME =
+            "io.customer.live_notification_channel_name"
+
+        @VisibleForTesting
+        internal const val METADATA_LIVE_NOTIFICATION_CHANNEL_IMPORTANCE =
+            "io.customer.live_notification_channel_importance"
     }
 
     /**
@@ -51,51 +63,98 @@ internal class NotificationChannelCreator(
         appMetaData: Bundle?,
         notificationManager: NotificationManager
     ): String {
-        val defaultChannelId = context.packageName
         val channelId = appMetaData?.getMetaDataString(name = METADATA_NOTIFICATION_CHANNEL_ID)
-            ?: defaultChannelId
+            ?: context.packageName
 
         // Since android Oreo notification channel is needed.
         if (androidVersionChecker.isOreoOrHigher()) {
-            val existingChannel = notificationManager.getNotificationChannel(channelId)
-
-            val channelName =
-                appMetaData?.getMetaDataString(name = METADATA_NOTIFICATION_CHANNEL_NAME)
-                    ?: "$applicationName Notifications"
-            val rawImportance = appMetaData?.getInt(
-                METADATA_NOTIFICATION_CHANNEL_IMPORTANCE,
-                NotificationManager.IMPORTANCE_DEFAULT
-            ) ?: NotificationManager.IMPORTANCE_DEFAULT
-
-            // Validate that the importance value is a valid NotificationManager constant
-            val importance = validateImportanceLevel(rawImportance)
-
-            // Only create or update the channel if it doesn't exist or the name is different
-            if (existingChannel == null || existingChannel.name != channelName) {
-                logger.logCreatingNotificationChannel(channelId, channelName, importance)
-                val channel = NotificationChannel(
-                    channelId,
-                    channelName,
-                    importance
-                )
-                notificationManager.createNotificationChannel(channel)
-            } else {
-                logger.logNotificationChannelAlreadyExists(channelId)
-            }
+            val channelName = appMetaData?.getMetaDataString(name = METADATA_NOTIFICATION_CHANNEL_NAME)
+                ?: "$applicationName Notifications"
+            val importance = resolveImportance(
+                appMetaData = appMetaData,
+                metadataKey = METADATA_NOTIFICATION_CHANNEL_IMPORTANCE,
+                default = NotificationManager.IMPORTANCE_DEFAULT
+            )
+            createOrUpdateChannel(notificationManager, channelId, channelName, importance)
         }
 
         return channelId
     }
 
     /**
-     * Validates that the provided importance level is a valid NotificationManager importance constant.
-     * If the value is not valid, it returns the default importance level.
+     * Creates a notification channel for live notifications on Android Oreo+ and returns its ID.
+     *
+     * Defaults to `{packageName}_cio_live` / `{appName} Live Updates` / `IMPORTANCE_HIGH`.
+     * Each value can be overridden via manifest `<meta-data>`:
+     * - `io.customer.live_notification_channel_id`
+     * - `io.customer.live_notification_channel_name`
+     * - `io.customer.live_notification_channel_importance` (integer, e.g. 4 for HIGH)
      *
-     * @param importanceLevel The importance level to validate
-     * @return A valid NotificationManager importance constant
+     * `IMPORTANCE_HIGH` is the recommended default — it ensures the first "start" event
+     * surfaces as a heads-up notification. Note: channel importance cannot be changed
+     * programmatically after the channel is created on a device.
+     *
+     * @param context The application context
+     * @param applicationName The application name used to derive the default channel name
+     * @param appMetaData The application metadata bundle
+     * @param notificationManager The notification manager instance
+     * @return The channel ID to use in the notification builder
+     */
+    fun createLiveNotificationChannelIfNeededAndReturnChannelId(
+        context: Context,
+        applicationName: String,
+        appMetaData: Bundle?,
+        notificationManager: NotificationManager
+    ): String {
+        val channelId = appMetaData?.getMetaDataString(name = METADATA_LIVE_NOTIFICATION_CHANNEL_ID)
+            ?: "${context.packageName}_cio_live"
+
+        if (androidVersionChecker.isOreoOrHigher()) {
+            val channelName = appMetaData?.getMetaDataString(name = METADATA_LIVE_NOTIFICATION_CHANNEL_NAME)
+                ?: "$applicationName Live Updates"
+            val importance = resolveImportance(
+                appMetaData = appMetaData,
+                metadataKey = METADATA_LIVE_NOTIFICATION_CHANNEL_IMPORTANCE,
+                default = NotificationManager.IMPORTANCE_HIGH
+            )
+            createOrUpdateChannel(notificationManager, channelId, channelName, importance)
+        }
+
+        return channelId
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun createOrUpdateChannel(
+        notificationManager: NotificationManager,
+        channelId: String,
+        channelName: String,
+        importance: Int
+    ) {
+        val existingChannel = notificationManager.getNotificationChannel(channelId)
+        // Only create or update the channel if it doesn't exist or the name is different
+        if (existingChannel == null || existingChannel.name != channelName) {
+            logger.logCreatingNotificationChannel(channelId, channelName, importance)
+            val channel = NotificationChannel(channelId, channelName, importance)
+            notificationManager.createNotificationChannel(channel)
+        } else {
+            logger.logNotificationChannelAlreadyExists(channelId)
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    private fun resolveImportance(appMetaData: Bundle?, metadataKey: String, default: Int): Int {
+        val rawImportance = appMetaData?.getInt(metadataKey, default) ?: default
+        return validateImportanceLevel(rawImportance, fallback = default)
+    }
+
+    /**
+     * Validates that the provided importance level is a valid NotificationManager importance constant.
+     * If the value is not valid, returns the supplied [fallback] so each caller preserves its own
+     * intended default (e.g. `IMPORTANCE_HIGH` for live notifications) rather than silently
+     * collapsing to `IMPORTANCE_DEFAULT`.
      */
     @RequiresApi(Build.VERSION_CODES.N)
-    private fun validateImportanceLevel(importanceLevel: Int): Int {
+    private fun validateImportanceLevel(importanceLevel: Int, fallback: Int): Int {
         return when (importanceLevel) {
             NotificationManager.IMPORTANCE_NONE,
             NotificationManager.IMPORTANCE_MIN,
@@ -106,7 +165,7 @@ internal class NotificationChannelCreator(
 
             else -> {
                 logger.logInvalidNotificationChannelImportance(importanceLevel)
-                NotificationManager.IMPORTANCE_DEFAULT
+                fallback
             }
         }
     }

From b0870a042240c26c28bf7eba1eb689f5551fa577 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Fri, 24 Apr 2026 20:55:52 +0300
Subject: [PATCH 02/10] chore: live notification rendering and routing (#670)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../io/customer/messagingpush/ActionData.kt   |  17 ++
 .../Api36LiveNotificationBuilder.kt           | 221 +++++++++++++++
 .../messagingpush/BasicNotificationBuilder.kt | 104 +++++++
 .../CustomerIOPushNotificationHandler.kt      |  30 +-
 .../messagingpush/LiveNotificationHandler.kt  | 258 ++++++++++++++++++
 5 files changed, 627 insertions(+), 3 deletions(-)
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt

diff --git a/messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt b/messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt
new file mode 100644
index 000000000..35e291277
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt
@@ -0,0 +1,17 @@
+package io.customer.messagingpush
+
+import android.app.PendingIntent
+
+/**
+ * Represents a single action button on a live notification.
+ *
+ * @property label The user-visible button text (e.g. "View Order")
+ * @property link Deep link URI fired when the action is tapped
+ * @property pendingIntent The PendingIntent that routes through
+ *           [NotificationClickReceiverActivity] for tracking and deep link handling
+ */
+internal data class ActionData(
+    val label: String,
+    val link: String,
+    val pendingIntent: PendingIntent
+)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
new file mode 100644
index 000000000..db0d169b6
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
@@ -0,0 +1,221 @@
+package io.customer.messagingpush
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.os.Bundle
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.toColorInt
+import io.customer.sdk.core.di.SDKComponent
+import org.json.JSONArray
+import org.json.JSONException
+
+/**
+ * Parameters for building a promoted live notification on API 36+ (BAKLAVA).
+ *
+ * When [showProgress] is true, uses [Notification.ProgressStyle] with full
+ * segmented progress bar support. When false, uses [Notification.BigTextStyle]
+ * for text-only live updates (sports scores, auction bids, etc.).
+ *
+ * Both modes request promoted ongoing status for live update treatment.
+ */
+internal data class Api36LiveNotificationParams(
+    val context: Context,
+    val channelId: String,
+    val title: String,
+    val body: String,
+    val subText: String?,
+    @DrawableRes val smallIcon: Int,
+    @ColorInt val accentColor: Int?,
+    val segmentsJson: String?,
+    val pointsJson: String?,
+    val progress: Int,
+    val progressMax: Int,
+    @DrawableRes val startIconRes: Int?,
+    @DrawableRes val endIconRes: Int?,
+    @DrawableRes val trackerIconRes: Int?,
+    val pendingIntent: PendingIntent?,
+    val countdownUntil: Long?,
+    val largeIcon: Bitmap?,
+    val actions: List<ActionData>,
+    val showProgress: Boolean
+)
+
+/**
+ * Builds promoted live notifications on API 36+ (BAKLAVA).
+ *
+ * Uses [Notification.ProgressStyle] for progress-based notifications and
+ * [Notification.BigTextStyle] for text-only live updates. Both styles are
+ * valid for promoted live updates per Android documentation.
+ *
+ * Requirements for promoted live updates (customer responsibility):
+ * - App manifest must declare `android.permission.POST_PROMOTED_NOTIFICATIONS`
+ * - Notification must not be colorized (this builder does not call setColorized)
+ * - Notification must use an allowed style (ProgressStyle or BigTextStyle)
+ * - Notification must have a title and be ongoing
+ */
+internal object Api36LiveNotificationBuilder {
+
+    private const val MAX_ACTIONS = 3
+
+    // Notification.EXTRA_REQUEST_PROMOTED_ONGOING was added in extension SDK 36.1.
+    // Use the raw string value so we can compile against base API 36.
+    private const val EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing"
+    private const val POST_PROMOTED_NOTIFICATIONS_PERMISSION =
+        "android.permission.POST_PROMOTED_NOTIFICATIONS"
+
+    @RequiresApi(Build.VERSION_CODES.BAKLAVA)
+    fun build(params: Api36LiveNotificationParams): Notification {
+        val builder = Notification.Builder(params.context, params.channelId)
+            .setSmallIcon(params.smallIcon)
+            .setContentTitle(params.title)
+            .setContentText(params.body)
+            .setOngoing(true)
+            .setOnlyAlertOnce(true)
+
+        // Request promoted ongoing status when the host app holds the permission.
+        // If missing, fall back silently to standard ongoing — the notification still posts.
+        if (canPostPromotedNotifications(params.context)) {
+            val extras = Bundle().apply {
+                putBoolean(EXTRA_REQUEST_PROMOTED_ONGOING, true)
+            }
+            builder.addExtras(extras)
+        } else {
+            SDKComponent.logger.debug(
+                "POST_PROMOTED_NOTIFICATIONS not granted; posting as standard ongoing"
+            )
+        }
+
+        if (params.showProgress) {
+            builder.setCategory(Notification.CATEGORY_PROGRESS)
+
+            val segments = params.segmentsJson?.let { parseSegments(it) } ?: emptyList()
+            // When no segments are provided, create a single segment sized to progressMax
+            // so ProgressStyle knows the total range for the bar.
+            val effectiveSegments = segments.ifEmpty {
+                listOf(Notification.ProgressStyle.Segment(params.progressMax))
+            }
+            val maxProgress = effectiveSegments.sumOf { it.length }
+            val safeProgress = params.progress.coerceIn(0, maxProgress)
+
+            val progressStyle = Notification.ProgressStyle()
+                .setProgress(safeProgress)
+
+            progressStyle.progressSegments = effectiveSegments
+
+            params.pointsJson?.let { json ->
+                val points = parsePoints(json, maxProgress)
+                if (points.isNotEmpty()) {
+                    progressStyle.progressPoints = points
+                }
+            }
+
+            params.startIconRes?.let { res ->
+                progressStyle.setProgressStartIcon(Icon.createWithResource(params.context, res))
+            }
+            params.endIconRes?.let { res ->
+                progressStyle.setProgressEndIcon(Icon.createWithResource(params.context, res))
+            }
+            params.trackerIconRes?.let { res ->
+                progressStyle.setProgressTrackerIcon(Icon.createWithResource(params.context, res))
+            }
+
+            builder.style = progressStyle
+        } else {
+            builder.setCategory(Notification.CATEGORY_STATUS)
+            builder.style = Notification.BigTextStyle().bigText(params.body)
+        }
+
+        // Countdown timer
+        params.countdownUntil?.let { until ->
+            builder.setWhen(until)
+            builder.setUsesChronometer(true)
+            builder.setChronometerCountDown(true)
+            builder.setShowWhen(true)
+        }
+
+        // Large icon
+        params.largeIcon?.let { bitmap ->
+            builder.setLargeIcon(Icon.createWithBitmap(bitmap))
+        }
+
+        params.subText?.let { builder.setSubText(it) }
+        params.accentColor?.let { builder.setColor(it) }
+        params.pendingIntent?.let { builder.setContentIntent(it) }
+
+        // Action buttons (Android supports max 3)
+        val actionCount = minOf(params.actions.size, MAX_ACTIONS)
+        for (i in 0 until actionCount) {
+            val action = params.actions[i]
+            builder.addAction(
+                Notification.Action.Builder(null, action.label, action.pendingIntent).build()
+            )
+        }
+
+        return builder.build()
+    }
+
+    private fun canPostPromotedNotifications(context: Context): Boolean {
+        return ContextCompat.checkSelfPermission(
+            context,
+            POST_PROMOTED_NOTIFICATIONS_PERMISSION
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+
+    @RequiresApi(Build.VERSION_CODES.BAKLAVA)
+    private fun parseSegments(json: String): List<Notification.ProgressStyle.Segment> {
+        val segments = mutableListOf<Notification.ProgressStyle.Segment>()
+        try {
+            val array = JSONArray(json)
+            for (i in 0 until array.length()) {
+                val obj = array.getJSONObject(i)
+                val length = obj.optInt("length", 1).coerceAtLeast(1)
+                val segment = Notification.ProgressStyle.Segment(length)
+                val colorStr = obj.optString("color", "")
+                if (colorStr.isNotEmpty()) {
+                    try {
+                        segment.color = colorStr.toColorInt()
+                    } catch (e: IllegalArgumentException) {
+                        SDKComponent.logger.error("Invalid segment color '$colorStr': ${e.message}")
+                    }
+                }
+                segments.add(segment)
+            }
+        } catch (e: JSONException) {
+            SDKComponent.logger.error("Failed to parse live notification segments JSON: ${e.message}")
+        }
+        return segments
+    }
+
+    @RequiresApi(Build.VERSION_CODES.BAKLAVA)
+    private fun parsePoints(json: String, maxProgress: Int): List<Notification.ProgressStyle.Point> {
+        val points = mutableListOf<Notification.ProgressStyle.Point>()
+        try {
+            val array = JSONArray(json)
+            for (i in 0 until array.length()) {
+                val obj = array.getJSONObject(i)
+                val position = obj.optInt("position", 0).coerceIn(0, maxProgress)
+                val point = Notification.ProgressStyle.Point(position)
+                val colorStr = obj.optString("color", "")
+                if (colorStr.isNotEmpty()) {
+                    try {
+                        point.color = colorStr.toColorInt()
+                    } catch (e: IllegalArgumentException) {
+                        SDKComponent.logger.error("Invalid point color '$colorStr': ${e.message}")
+                    }
+                }
+                points.add(point)
+            }
+        } catch (e: JSONException) {
+            SDKComponent.logger.error("Failed to parse live notification points JSON: ${e.message}")
+        }
+        return points
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
new file mode 100644
index 000000000..15cb2b1f0
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
@@ -0,0 +1,104 @@
+package io.customer.messagingpush
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Build
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.core.app.NotificationCompat
+
+/**
+ * Parameters for building a live notification on pre-API 36 devices using
+ * standard [NotificationCompat] styles.
+ *
+ * Supports:
+ * - Standard linear progress bar (determinate)
+ * - Accent color for notification chrome
+ * - Colorized mode (tints the entire notification background)
+ * - Title, body, and subtext via standard notification fields
+ * - Countdown timer (countdown direction requires API 24+)
+ *
+ * Not supported on this tier (use [Api36LiveNotificationParams] on API 36+):
+ * - Segmented progress bar with custom segment colors
+ * - Progress points, start/end/tracker icons
+ * - Promoted live update status
+ */
+internal data class BasicNotificationParams(
+    val context: Context,
+    val channelId: String,
+    val title: String,
+    val body: String,
+    val subText: String?,
+    @DrawableRes val smallIcon: Int,
+    @ColorInt val accentColor: Int?,
+    val colorized: Boolean,
+    val progress: Int,
+    val progressMax: Int,
+    val pendingIntent: PendingIntent?,
+    val countdownUntil: Long?,
+    val largeIcon: Bitmap?,
+    val actions: List<ActionData>,
+    val showProgress: Boolean
+)
+
+/**
+ * Builds live notifications for pre-API 36 devices using standard
+ * [NotificationCompat] styles with a native progress bar.
+ */
+internal object BasicNotificationBuilder {
+
+    private const val MAX_ACTIONS = 3
+
+    fun build(params: BasicNotificationParams): Notification {
+        val category = if (params.showProgress) {
+            NotificationCompat.CATEGORY_PROGRESS
+        } else {
+            NotificationCompat.CATEGORY_STATUS
+        }
+
+        val builder = NotificationCompat.Builder(params.context, params.channelId)
+            .setSmallIcon(params.smallIcon)
+            .setContentTitle(params.title)
+            .setContentText(params.body)
+            .setOngoing(true)
+            .setOnlyAlertOnce(true)
+            .setCategory(category)
+            .setStyle(NotificationCompat.BigTextStyle().bigText(params.body))
+
+        if (params.showProgress) {
+            val safeProgress = params.progress.coerceIn(0, params.progressMax)
+            builder.setProgress(params.progressMax, safeProgress, false)
+        }
+
+        // Countdown timer
+        params.countdownUntil?.let { until ->
+            builder.setWhen(until)
+            builder.setUsesChronometer(true)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                builder.setChronometerCountDown(true)
+            }
+            builder.setShowWhen(true)
+        }
+
+        // Large icon
+        params.largeIcon?.let { builder.setLargeIcon(it) }
+
+        params.subText?.let { builder.setSubText(it) }
+        params.accentColor?.let { builder.setColor(it) }
+        if (params.colorized) {
+            builder.setColorized(true)
+        }
+        params.pendingIntent?.let { builder.setContentIntent(it) }
+
+        // Action buttons (Android supports max 3)
+        val actionCount = minOf(params.actions.size, MAX_ACTIONS)
+        for (i in 0 until actionCount) {
+            val action = params.actions[i]
+            builder.addAction(0, action.label, action.pendingIntent)
+        }
+
+        return builder.build()
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt
index e27f3c476..705b14ce2 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/CustomerIOPushNotificationHandler.kt
@@ -113,9 +113,6 @@ internal class CustomerIOPushNotificationHandler(
         pushLogger.logShowingPushNotification(remoteMessage)
 
         val applicationName = context.applicationInfo.loadLabel(context.packageManager).toString()
-        val requestCode = abs(System.currentTimeMillis().toInt())
-
-        bundle.putInt(NOTIFICATION_REQUEST_CODE, requestCode)
 
         val appMetaData = context.applicationMetaData()
 
@@ -146,6 +143,33 @@ internal class CustomerIOPushNotificationHandler(
             appMetaData = appMetaData,
             notificationManager = notificationManager
         )
+
+        // Check if this is a live notification
+        val activityId = bundle.getString(LiveNotificationHandler.ACTIVITY_ID_KEY)
+        if (activityId != null) {
+            val liveChannelId = notificationChannelCreator.createLiveNotificationChannelIfNeededAndReturnChannelId(
+                context = context,
+                applicationName = applicationName,
+                appMetaData = appMetaData,
+                notificationManager = notificationManager
+            )
+            // onNotificationComposed is intentionally not called for live notifications —
+            // their layout is SDK-controlled and cannot be safely modified by host apps.
+            LiveNotificationHandler(bundle).handle(
+                context = context,
+                deliveryId = deliveryId,
+                deliveryToken = deliveryToken,
+                smallIcon = smallIcon,
+                tintColor = tintColor,
+                channelId = liveChannelId,
+                notificationManager = notificationManager
+            )
+            return
+        }
+
+        val requestCode = abs(System.currentTimeMillis().toInt())
+        bundle.putInt(NOTIFICATION_REQUEST_CODE, requestCode)
+
         val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
         val notificationBuilder = NotificationCompat.Builder(context, channelId)
             .setSmallIcon(smallIcon)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
new file mode 100644
index 000000000..2d5152588
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
@@ -0,0 +1,258 @@
+package io.customer.messagingpush
+
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.os.Build
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import io.customer.messagingpush.activity.NotificationClickReceiverActivity
+import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
+import io.customer.messagingpush.extensions.getDrawableByName
+import io.customer.messagingpush.extensions.toColorOrNull
+import io.customer.messagingpush.util.BitmapDownloader
+import io.customer.sdk.core.di.SDKComponent
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+/**
+ * Handles live notification creation, updates, and dismissal.
+ *
+ * Live notifications are ongoing notifications that can be updated in-place
+ * (the Android counterpart of iOS Live Activities). They use a stable
+ * notification ID derived from [ACTIVITY_ID_KEY] so successive pushes
+ * replace the previous notification rather than creating new ones.
+ *
+ * Payload schema (iOS-style split):
+ * - [ACTIVITY_ID_KEY] — stable id
+ * - [EVENT_KEY] — "start" | "update" | "end"
+ * - [ACTIVITY_TYPE_KEY] — "progress" | "countdown" | "text"
+ * - [ATTRIBUTES_KEY] — JSON string: structural/static data (progress_max, icons, etc.)
+ * - [CONTENT_STATE_KEY] — JSON string: dynamic data (title, body, progress, subtext, etc.)
+ */
+internal class LiveNotificationHandler(
+    private val bundle: Bundle
+) {
+
+    companion object {
+        const val ACTIVITY_ID_KEY = "activity_id"
+        const val EVENT_KEY = "event"
+        const val ACTIVITY_TYPE_KEY = "activity_type"
+        const val CONTENT_STATE_KEY = "content_state"
+        const val ATTRIBUTES_KEY = "attributes"
+
+        private const val TYPE_PROGRESS = "progress"
+        private const val TYPE_COUNTDOWN = "countdown"
+
+        private const val EVENT_END = "end"
+
+        private const val DEFAULT_DISMISS_DELAY_MS = 3000L
+    }
+
+    fun handle(
+        context: Context,
+        deliveryId: String,
+        deliveryToken: String,
+        @DrawableRes smallIcon: Int,
+        @ColorInt tintColor: Int?,
+        channelId: String,
+        notificationManager: NotificationManager
+    ) {
+        // Log a warning on API 33+ if POST_NOTIFICATIONS is not granted. We do not
+        // bail out here — the system will silently drop the notification at notify()
+        // time, matching how standard push notifications behave in the same situation.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+            ContextCompat.checkSelfPermission(context, android.Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+            SDKComponent.logger.error(
+                "POST_NOTIFICATIONS permission not granted; live notification will be dropped by the system. " +
+                    "The host app must request this permission on Android 13+."
+            )
+        }
+
+        val activityId = bundle.getString(ACTIVITY_ID_KEY) ?: return
+        val event = bundle.getString(EVENT_KEY) ?: "update"
+        val activityType = bundle.getString(ACTIVITY_TYPE_KEY) ?: TYPE_PROGRESS
+
+        val attributes = parseJson(ATTRIBUTES_KEY, bundle.getString(ATTRIBUTES_KEY))
+        val contentState = parseJson(CONTENT_STATE_KEY, bundle.getString(CONTENT_STATE_KEY))
+
+        // Structural fields (attributes — stable for the life of the activity)
+        val progressMax = attributes.optInt("progress_max", 100)
+        val segmentsJson = attributes.optString("segments").takeIf { it.isNotEmpty() }
+        val startIconRes = context.getDrawableByName(attributes.optString("start_icon").takeIf { it.isNotEmpty() })
+        val endIconRes = context.getDrawableByName(attributes.optString("end_icon").takeIf { it.isNotEmpty() })
+        val trackerIconRes = context.getDrawableByName(attributes.optString("tracker_icon").takeIf { it.isNotEmpty() })
+        val largeIconUrl = attributes.optString("large_icon").takeIf { it.isNotEmpty() }
+        val colorized = attributes.optBoolean("colorized", false)
+        val dismissDelay = attributes.optLong("dismiss_delay", DEFAULT_DISMISS_DELAY_MS)
+
+        // Dynamic fields (content_state — updated on every event)
+        val title = contentState.optString("title")
+        val body = contentState.optString("body")
+        val subText = contentState.optString("subtext").takeIf { it.isNotEmpty() }
+        val backgroundColor = contentState.optString("color").takeIf { it.isNotEmpty() }?.toColorOrNull()
+        val actionsJson = contentState.optString("actions").takeIf { it.isNotEmpty() }
+        val progress = contentState.optInt("progress", 0)
+        val pointsJson = contentState.optString("points").takeIf { it.isNotEmpty() }
+        val countdownUntil = if (activityType == TYPE_COUNTDOWN && contentState.has("countdown_until")) {
+            contentState.optLong("countdown_until").takeIf { it > 0 }
+        } else {
+            null
+        }
+
+        val showProgress = activityType == TYPE_PROGRESS
+
+        val largeIcon: Bitmap? = largeIconUrl?.let { url -> BitmapDownloader.download(url) }
+
+        val notifId = activityId.hashCode() and 0x7FFFFFFF
+
+        bundle.putInt(CustomerIOPushNotificationHandler.NOTIFICATION_REQUEST_CODE, notifId)
+
+        val payload = CustomerIOParsedPushPayload(
+            extras = Bundle(bundle),
+            deepLink = bundle.getString(CustomerIOPushNotificationHandler.DEEP_LINK_KEY),
+            cioDeliveryId = deliveryId,
+            cioDeliveryToken = deliveryToken,
+            title = title,
+            body = body,
+            activityId = activityId
+        )
+
+        val pendingIntent = createIntentForNotificationClick(context, notifId, payload)
+
+        val actions = parseActions(context, actionsJson, activityId, payload)
+
+        val notification = when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> {
+                val params = Api36LiveNotificationParams(
+                    context = context,
+                    channelId = channelId,
+                    title = title,
+                    body = body,
+                    subText = subText,
+                    smallIcon = smallIcon,
+                    accentColor = backgroundColor ?: tintColor,
+                    segmentsJson = segmentsJson,
+                    pointsJson = pointsJson,
+                    progress = progress,
+                    progressMax = progressMax,
+                    startIconRes = startIconRes,
+                    endIconRes = endIconRes,
+                    trackerIconRes = trackerIconRes,
+                    pendingIntent = pendingIntent,
+                    countdownUntil = countdownUntil,
+                    largeIcon = largeIcon,
+                    actions = actions,
+                    showProgress = showProgress
+                )
+                Api36LiveNotificationBuilder.build(params)
+            }
+            else -> {
+                val params = BasicNotificationParams(
+                    context = context,
+                    channelId = channelId,
+                    title = title,
+                    body = body,
+                    subText = subText,
+                    smallIcon = smallIcon,
+                    accentColor = backgroundColor ?: tintColor,
+                    colorized = colorized,
+                    progress = progress,
+                    progressMax = progressMax,
+                    pendingIntent = pendingIntent,
+                    countdownUntil = countdownUntil,
+                    largeIcon = largeIcon,
+                    actions = actions,
+                    showProgress = showProgress
+                )
+                BasicNotificationBuilder.build(params)
+            }
+        }
+
+        notificationManager.notify(activityId, notifId, notification)
+
+        if (event == EVENT_END) {
+            Handler(Looper.getMainLooper()).postDelayed({
+                notificationManager.cancel(activityId, notifId)
+            }, dismissDelay)
+        }
+    }
+
+    private fun parseJson(key: String, raw: String?): JSONObject {
+        if (raw.isNullOrEmpty()) return JSONObject()
+        return try {
+            JSONObject(raw)
+        } catch (e: JSONException) {
+            SDKComponent.logger.error("Failed to parse live notification '$key' JSON: ${e.message}")
+            JSONObject()
+        }
+    }
+
+    private fun parseActions(
+        context: Context,
+        actionsJson: String?,
+        activityId: String,
+        payload: CustomerIOParsedPushPayload
+    ): List<ActionData> {
+        if (actionsJson.isNullOrBlank()) return emptyList()
+
+        val actions = mutableListOf<ActionData>()
+        try {
+            val array = JSONArray(actionsJson)
+            val count = minOf(array.length(), 3) // Android supports max 3 action buttons
+            for (i in 0 until count) {
+                val obj = array.getJSONObject(i)
+                val label = obj.optString("label", "").takeIf { it.isNotEmpty() } ?: continue
+                val link = obj.optString("link", "")
+
+                val actionPayload = CustomerIOParsedPushPayload(
+                    extras = payload.extras,
+                    deepLink = link.takeIf { it.isNotEmpty() },
+                    cioDeliveryId = payload.cioDeliveryId,
+                    cioDeliveryToken = payload.cioDeliveryToken,
+                    title = payload.title,
+                    body = payload.body,
+                    activityId = activityId
+                )
+
+                val requestCode = (activityId.hashCode() + i + 1) and 0x7FFFFFFF
+                val pendingIntent = createIntentForNotificationClick(context, requestCode, actionPayload)
+
+                actions.add(ActionData(label = label, link = link, pendingIntent = pendingIntent))
+            }
+        } catch (e: JSONException) {
+            SDKComponent.logger.error("Failed to parse live notification actions JSON: ${e.message}")
+        }
+        return actions
+    }
+
+    private fun createIntentForNotificationClick(
+        context: Context,
+        requestCode: Int,
+        payload: CustomerIOParsedPushPayload
+    ): PendingIntent {
+        val notifyIntent = Intent(context, NotificationClickReceiverActivity::class.java)
+        notifyIntent.putExtra(NotificationClickReceiverActivity.NOTIFICATION_PAYLOAD_EXTRA, payload)
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+        return PendingIntent.getActivity(
+            context,
+            requestCode,
+            notifyIntent,
+            flags
+        )
+    }
+}

From 29947b0b71af9b0bc828d22b7996bc40b25c8108 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Tue, 28 Apr 2026 17:38:55 +0300
Subject: [PATCH 03/10] chore: live notification demo activity (#671)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../java_layout/src/main/AndroidManifest.xml  |   4 +
 .../ui/dashboard/DashboardActivity.java       |   4 +
 .../LiveNotificationDemoActivity.java         | 360 ++++++++++++++++++
 .../main/res/layout/activity_dashboard.xml    |  17 +-
 .../activity_live_notification_demo.xml       | 136 +++++++
 .../src/main/res/values/strings.xml           |  19 +
 6 files changed, 538 insertions(+), 2 deletions(-)
 create mode 100644 samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
 create mode 100644 samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml

diff --git a/samples/java_layout/src/main/AndroidManifest.xml b/samples/java_layout/src/main/AndroidManifest.xml
index ecfaae50e..01b392db1 100644
--- a/samples/java_layout/src/main/AndroidManifest.xml
+++ b/samples/java_layout/src/main/AndroidManifest.xml
@@ -139,6 +139,10 @@
             android:name=".ui.inbox.InboxMessagesActivity"
             android:exported="false"
             android:label="@string/label_inbox_messages_activity" />
+        <activity
+            android:name=".ui.livenotification.LiveNotificationDemoActivity"
+            android:exported="false"
+            android:label="@string/label_live_notification_demo_activity" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/dashboard/DashboardActivity.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/dashboard/DashboardActivity.java
index 6358b5807..277687365 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/dashboard/DashboardActivity.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/dashboard/DashboardActivity.java
@@ -34,6 +34,7 @@
 import io.customer.android.sample.java_layout.ui.core.BaseActivity;
 import io.customer.android.sample.java_layout.ui.inbox.InboxMessagesActivity;
 import io.customer.android.sample.java_layout.ui.inline.InlineExamplesActivity;
+import io.customer.android.sample.java_layout.ui.livenotification.LiveNotificationDemoActivity;
 import io.customer.android.sample.java_layout.ui.location.LocationTestActivity;
 import io.customer.android.sample.java_layout.ui.login.LoginActivity;
 import io.customer.android.sample.java_layout.ui.settings.InternalSettingsActivity;
@@ -160,6 +161,9 @@ private void setupViews() {
         binding.inboxMessagesButton.setOnClickListener(view -> {
             startInboxMessagesActivity();
         });
+        binding.liveNotificationDemoButton.setOnClickListener(view -> {
+            startActivity(new Intent(DashboardActivity.this, LiveNotificationDemoActivity.class));
+        });
         binding.logoutButton.setOnClickListener(view -> {
             authViewModel.clearLoggedInUser();
         });
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
new file mode 100644
index 000000000..aee406aa2
--- /dev/null
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
@@ -0,0 +1,360 @@
+package io.customer.android.sample.java_layout.ui.livenotification;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+
+import com.google.firebase.messaging.RemoteMessage;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.UUID;
+
+import io.customer.android.sample.java_layout.R;
+import io.customer.android.sample.java_layout.databinding.ActivityLiveNotificationDemoBinding;
+import io.customer.android.sample.java_layout.ui.core.BaseActivity;
+import io.customer.messagingpush.CustomerIOFirebaseMessagingService;
+
+/**
+ * Demo activity that simulates live notification updates by sending synthetic
+ * push messages through the SDK's actual push handling code path.
+ * <p>
+ * Select a notification type via radio buttons, then use manual controls
+ * (Start / Update / End) or auto-run all steps with a 2-second interval.
+ * <p>
+ * Payloads follow the iOS-style Live Activity schema: top-level keys
+ * ({@code activity_id}, {@code event}, {@code activity_type}) plus two
+ * JSON blobs: {@code attributes} (structural/static) and
+ * {@code content_state} (dynamic/mutable).
+ */
+public class LiveNotificationDemoActivity extends BaseActivity<ActivityLiveNotificationDemoBinding> {
+
+    private static final String DEMO_DELIVERY_TOKEN = "demo-token-live";
+    private static final long AUTO_STEP_DELAY_MS = 2000;
+
+    // Event values (lifecycle)
+    private static final String EVENT_START = "start";
+    private static final String EVENT_UPDATE = "update";
+    private static final String EVENT_END = "end";
+
+    // Activity types (rendering mode)
+    private static final String TYPE_PROGRESS = "progress";
+    private static final String TYPE_COUNTDOWN = "countdown";
+    private static final String TYPE_TEXT = "text";
+
+    // Shared demo assets
+    private static final String DEMO_ICON = "ic_notification";
+    // Lorem Picsum — free placeholder image service (https://picsum.photos).
+    // Using a fixed image id so the demo displays the same image on every run.
+    private static final String DEMO_LARGE_ICON_URL = "https://picsum.photos/id/237/400/400.jpg";
+    private static final long DEMO_DISMISS_DELAY_MS = 5000L;
+
+    // Delivery tracking config
+    private static final String DELIVERY_ID = "demo-delivery";
+    private static final String[] DELIVERY_TITLES = {"Ordered", "Preparing", "On the way", "Delivered"};
+    private static final String[] DELIVERY_BODIES = {
+            "Your order has been placed",
+            "Your order is being prepared",
+            "Your order is on the way",
+            "Your order has been delivered"
+    };
+    private static final String[] DELIVERY_SUBTEXTS = {
+            "Estimated delivery: 30 min",
+            "Estimated delivery: 25 min",
+            "Estimated delivery: 10 min",
+            "Enjoy your meal!"
+    };
+    private static final String DELIVERY_SEGMENTS = "[{\"length\":1},{\"length\":1},{\"length\":1},{\"length\":1}]";
+    private static final String DELIVERY_COLOR = "#1B5E20";
+
+    // Sports score config
+    private static final String SPORTS_ID = "demo-sports";
+    private static final String[] SPORTS_TITLES = {"Lakers 98 - Celtics 95", "Lakers 101 - Celtics 97", "Final: Lakers 105 - Celtics 99"};
+    private static final String[] SPORTS_BODIES = {"Q4 2:30 remaining", "Q4 1:15 remaining", "Game Over"};
+    private static final String[] SPORTS_SUBTEXTS = {"Live", "Live", "Final"};
+    private static final String SPORTS_COLOR = "#4A148C";
+    private static final String SPORTS_ACTIONS =
+            "[{\"label\":\"Open Scorecard\",\"link\":\"sample://sports/game/123\"}]";
+
+    // Parking timer config
+    private static final String TIMER_ID = "demo-parking";
+    private static final String[] TIMER_TITLES = {"Parking Session", "Parking Session", "Parking Expired"};
+    private static final String[] TIMER_BODIES = {"Zone A - Spot 42", "Zone A - Spot 42", "Your session has ended"};
+    private static final String[] TIMER_SUBTEXTS = {"Time remaining", "Expiring soon", "Expired"};
+    private static final String[] TIMER_COLORS = {"#2E7D32", "#E65100", "#B71C1C"};
+    private static final String TIMER_ACTIONS =
+            "[{\"label\":\"Extend Parking\",\"link\":\"sample://parking/extend\"}]";
+
+    // Delivery with actions config
+    private static final String ACTIONS_ID = "demo-delivery-actions";
+    private static final String[] ACTIONS_TITLES = {"Order confirmed", "Preparing", "On the way", "Delivered!"};
+    private static final String[] ACTIONS_BODIES = {
+            "Restaurant received your order",
+            "Your food is being prepared",
+            "Driver is heading to you",
+            "Enjoy your meal"
+    };
+    private static final String ACTIONS_SEGMENTS = "[{\"length\":1},{\"length\":1},{\"length\":1},{\"length\":1}]";
+    private static final String ACTIONS_COLOR = "#1B5E20";
+    private static final String ACTIONS_BUTTONS =
+            "[{\"label\":\"View Order\",\"link\":\"sample://order/456\"},{\"label\":\"Get Directions\",\"link\":\"sample://directions\"}]";
+
+    private enum NotificationType { DELIVERY, TIMER, SPORTS, DELIVERY_ACTIONS }
+
+    private int currentStep = 0;
+    private boolean isActive = false;
+    private final Handler autoHandler = new Handler(Looper.getMainLooper());
+    private boolean isAutoRunning = false;
+
+    @Override
+    protected ActivityLiveNotificationDemoBinding inflateViewBinding() {
+        return ActivityLiveNotificationDemoBinding.inflate(getLayoutInflater());
+    }
+
+    @Override
+    protected void setupContent() {
+        binding.topAppBar.setNavigationOnClickListener(v -> finish());
+
+        binding.startButton.setOnClickListener(v -> start());
+        binding.updateButton.setOnClickListener(v -> update());
+        binding.endButton.setOnClickListener(v -> end());
+        binding.autoButton.setOnClickListener(v -> autoRun());
+
+        binding.typeRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+            // Reset state when switching type
+            if (isActive) {
+                autoHandler.removeCallbacksAndMessages(null);
+                isActive = false;
+                isAutoRunning = false;
+                currentStep = 0;
+                updateButtonStates();
+                binding.statusTextView.setText(R.string.live_notification_status_idle);
+            }
+        });
+    }
+
+    private NotificationType getSelectedType() {
+        int checkedId = binding.typeRadioGroup.getCheckedRadioButtonId();
+        if (checkedId == R.id.radio_timer) return NotificationType.TIMER;
+        if (checkedId == R.id.radio_sports) return NotificationType.SPORTS;
+        if (checkedId == R.id.radio_delivery_actions) return NotificationType.DELIVERY_ACTIONS;
+        return NotificationType.DELIVERY;
+    }
+
+    private int getStepCount() {
+        switch (getSelectedType()) {
+            case TIMER: return TIMER_TITLES.length;
+            case SPORTS: return SPORTS_TITLES.length;
+            case DELIVERY_ACTIONS: return ACTIONS_TITLES.length;
+            default: return DELIVERY_TITLES.length;
+        }
+    }
+
+    // --- Manual controls ---
+
+    private void start() {
+        currentStep = 0;
+        isActive = true;
+        updateButtonStates();
+        sendPush(EVENT_START, currentStep);
+        updateStatusText();
+    }
+
+    private void update() {
+        if (!isActive) return;
+        currentStep = Math.min(currentStep + 1, getStepCount() - 1);
+        updateButtonStates();
+        sendPush(EVENT_UPDATE, currentStep);
+        updateStatusText();
+    }
+
+    private void end() {
+        if (!isActive) return;
+        isActive = false;
+        updateButtonStates();
+        sendPush(EVENT_END, getStepCount() - 1);
+        binding.statusTextView.setText(R.string.live_notification_status_ended);
+    }
+
+    // --- Auto sequence ---
+
+    private void autoRun() {
+        if (isAutoRunning) return;
+        isAutoRunning = true;
+        binding.autoButton.setEnabled(false);
+        binding.startButton.setEnabled(false);
+
+        start();
+
+        int totalSteps = getStepCount();
+        for (int step = 1; step < totalSteps; step++) {
+            autoHandler.postDelayed(this::update, AUTO_STEP_DELAY_MS * step);
+        }
+        autoHandler.postDelayed(() -> {
+            end();
+            isAutoRunning = false;
+            updateButtonStates();
+        }, AUTO_STEP_DELAY_MS * totalSteps);
+    }
+
+    // --- Push construction ---
+
+    private void sendPush(String event, int step) {
+        switch (getSelectedType()) {
+            case DELIVERY:
+                sendDeliveryPush(event, step);
+                break;
+            case TIMER:
+                sendTimerPush(event, step);
+                break;
+            case SPORTS:
+                sendSportsPush(event, step);
+                break;
+            case DELIVERY_ACTIONS:
+                sendDeliveryActionsPush(event, step);
+                break;
+        }
+    }
+
+    private boolean isFullPayload() {
+        return binding.fullPayloadCheckbox.isChecked();
+    }
+
+    private void sendDeliveryPush(String event, int step) {
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            attributes.put("progress_max", DELIVERY_TITLES.length);
+            contentState.put("title", DELIVERY_TITLES[step]);
+            contentState.put("body", DELIVERY_BODIES[step]);
+            contentState.put("progress", step + 1);
+            if (isFullPayload()) {
+                attributes.put("segments", DELIVERY_SEGMENTS);
+                attributes.put("start_icon", DEMO_ICON);
+                attributes.put("end_icon", DEMO_ICON);
+                attributes.put("tracker_icon", DEMO_ICON);
+                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
+                attributes.put("colorized", true);
+                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
+                contentState.put("subtext", DELIVERY_SUBTEXTS[step]);
+                contentState.put("color", DELIVERY_COLOR);
+            }
+        } catch (JSONException ignored) { }
+        fire(baseBundle(DELIVERY_ID, event, TYPE_PROGRESS, attributes, contentState));
+    }
+
+    private void sendTimerPush(String event, int step) {
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            contentState.put("title", TIMER_TITLES[step]);
+            contentState.put("body", TIMER_BODIES[step]);
+            if (!event.equals(EVENT_END)) {
+                long countdownUntil = System.currentTimeMillis() + 5 * 1000;
+                contentState.put("countdown_until", countdownUntil);
+            }
+            if (isFullPayload()) {
+                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
+                attributes.put("colorized", true);
+                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
+                contentState.put("subtext", TIMER_SUBTEXTS[step]);
+                contentState.put("color", TIMER_COLORS[step]);
+                contentState.put("actions", TIMER_ACTIONS);
+            }
+        } catch (JSONException ignored) { }
+        fire(baseBundle(TIMER_ID, event, TYPE_COUNTDOWN, attributes, contentState));
+    }
+
+    private void sendSportsPush(String event, int step) {
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            contentState.put("title", SPORTS_TITLES[step]);
+            contentState.put("body", SPORTS_BODIES[step]);
+            if (isFullPayload()) {
+                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
+                attributes.put("colorized", true);
+                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
+                contentState.put("subtext", SPORTS_SUBTEXTS[step]);
+                contentState.put("color", SPORTS_COLOR);
+                contentState.put("actions", SPORTS_ACTIONS);
+            }
+        } catch (JSONException ignored) { }
+        fire(baseBundle(SPORTS_ID, event, TYPE_TEXT, attributes, contentState));
+    }
+
+    private void sendDeliveryActionsPush(String event, int step) {
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            attributes.put("progress_max", ACTIONS_TITLES.length);
+            contentState.put("title", ACTIONS_TITLES[step]);
+            contentState.put("body", ACTIONS_BODIES[step]);
+            contentState.put("progress", step + 1);
+            if (isFullPayload()) {
+                attributes.put("segments", ACTIONS_SEGMENTS);
+                attributes.put("start_icon", DEMO_ICON);
+                attributes.put("end_icon", DEMO_ICON);
+                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
+                attributes.put("colorized", true);
+                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
+                int minutesRemaining = Math.max(1, (ACTIONS_TITLES.length - step) * 3);
+                contentState.put("subtext", "ETA: " + minutesRemaining + " min");
+                contentState.put("color", ACTIONS_COLOR);
+                contentState.put("actions", ACTIONS_BUTTONS);
+            }
+        } catch (JSONException ignored) { }
+        Bundle bundle = baseBundle(ACTIONS_ID, event, TYPE_PROGRESS, attributes, contentState);
+        if (isFullPayload()) {
+            bundle.putString("link", "sample://order/456/details");
+        }
+        fire(bundle);
+    }
+
+    private Bundle baseBundle(String activityId, String event, String activityType,
+                              JSONObject attributes, JSONObject contentState) {
+        Bundle bundle = new Bundle();
+        bundle.putString("CIO-Delivery-ID", UUID.randomUUID().toString());
+        bundle.putString("CIO-Delivery-Token", DEMO_DELIVERY_TOKEN);
+        bundle.putString("activity_id", activityId);
+        bundle.putString("event", event);
+        bundle.putString("activity_type", activityType);
+        bundle.putString("attributes", attributes.toString());
+        bundle.putString("content_state", contentState.toString());
+        return bundle;
+    }
+
+    private void fire(Bundle bundle) {
+        RemoteMessage remoteMessage = new RemoteMessage(bundle);
+        CustomerIOFirebaseMessagingService.onMessageReceived(this, remoteMessage);
+    }
+
+    // --- UI state ---
+
+    private void updateButtonStates() {
+        int maxStep = getStepCount() - 1;
+        binding.startButton.setEnabled(!isActive && !isAutoRunning);
+        binding.updateButton.setEnabled(isActive && currentStep < maxStep);
+        binding.endButton.setEnabled(isActive);
+        binding.autoButton.setEnabled(!isAutoRunning);
+    }
+
+    private void updateStatusText() {
+        NotificationType type = getSelectedType();
+        String label;
+        switch (type) {
+            case TIMER: label = TIMER_TITLES[currentStep]; break;
+            case SPORTS: label = SPORTS_TITLES[currentStep]; break;
+            case DELIVERY_ACTIONS: label = ACTIONS_TITLES[currentStep]; break;
+            default: label = DELIVERY_TITLES[currentStep]; break;
+        }
+        binding.statusTextView.setText(getString(R.string.live_notification_status_format, label, currentStep + 1));
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        autoHandler.removeCallbacksAndMessages(null);
+    }
+}
diff --git a/samples/java_layout/src/main/res/layout/activity_dashboard.xml b/samples/java_layout/src/main/res/layout/activity_dashboard.xml
index f5e1b5cf2..0992c0289 100644
--- a/samples/java_layout/src/main/res/layout/activity_dashboard.xml
+++ b/samples/java_layout/src/main/res/layout/activity_dashboard.xml
@@ -233,12 +233,25 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_default"
                 android:text="@string/inbox_messages"
-                app:layout_constraintBottom_toTopOf="@id/logout_button"
+                app:layout_constraintBottom_toTopOf="@id/live_notification_demo_button"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/inline_examples_button"
                 app:layout_constraintWidth_max="@dimen/material_button_max_width" />
 
+            <Button
+                android:id="@+id/live_notification_demo_button"
+                style="?attr/materialButtonStyle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_default"
+                android:text="@string/live_notification_demo"
+                app:layout_constraintBottom_toTopOf="@id/logout_button"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/inbox_messages_button"
+                app:layout_constraintWidth_max="@dimen/material_button_max_width" />
+
             <Button
                 android:id="@+id/logout_button"
                 style="?attr/materialButtonStyle"
@@ -249,7 +262,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/inbox_messages_button"
+                app:layout_constraintTop_toBottomOf="@id/live_notification_demo_button"
                 app:layout_constraintWidth_max="@dimen/material_button_max_width" />
 
             <TextView
diff --git a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
new file mode 100644
index 000000000..894390420
--- /dev/null
+++ b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/top_app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorSurface"
+            app:navigationIcon="@drawable/ic_arrow_back_24"
+            app:title="@string/live_notification_demo" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:padding="@dimen/margin_default"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <TextView
+            android:id="@+id/status_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:text="@string/live_notification_status_idle"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+        <!-- Notification type selector -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/live_notification_section_type"
+            android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
+
+        <RadioGroup
+            android:id="@+id/type_radio_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:orientation="vertical">
+
+            <RadioButton
+                android:id="@+id/radio_delivery"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/live_notification_type_delivery" />
+
+            <RadioButton
+                android:id="@+id/radio_timer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/live_notification_type_timer" />
+
+            <RadioButton
+                android:id="@+id/radio_sports"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/live_notification_type_sports" />
+
+            <RadioButton
+                android:id="@+id/radio_delivery_actions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/live_notification_type_delivery_actions" />
+
+        </RadioGroup>
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/full_payload_checkbox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:checked="true"
+            android:text="@string/live_notification_full_payload" />
+
+        <!-- Manual controls -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/live_notification_section_manual"
+            android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
+
+        <Button
+            android:id="@+id/start_button"
+            style="?attr/materialButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:text="@string/live_notification_start" />
+
+        <Button
+            android:id="@+id/update_button"
+            style="?attr/materialButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:enabled="false"
+            android:text="@string/live_notification_update" />
+
+        <Button
+            android:id="@+id/end_button"
+            style="?attr/materialButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:enabled="false"
+            android:text="@string/live_notification_end" />
+
+        <!-- Auto controls -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/live_notification_section_auto"
+            android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
+
+        <Button
+            android:id="@+id/auto_button"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:text="@string/live_notification_auto" />
+
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/samples/java_layout/src/main/res/values/strings.xml b/samples/java_layout/src/main/res/values/strings.xml
index 1c0f14b4a..8b40639ee 100644
--- a/samples/java_layout/src/main/res/values/strings.xml
+++ b/samples/java_layout/src/main/res/values/strings.xml
@@ -157,4 +157,23 @@
     <string name="inbox_delete_cancel">Cancel</string>
     <string name="inbox_message_deleted">Message deleted</string>
 
+    <!-- Live Notification Demo -->
+    <string name="live_notification_demo">Live Notification Demo</string>
+    <string name="label_live_notification_demo_activity">LiveNotificationDemoActivity</string>
+    <string name="live_notification_start">Start</string>
+    <string name="live_notification_update">Update</string>
+    <string name="live_notification_end">End</string>
+    <string name="live_notification_status_idle">Status: Idle</string>
+    <string name="live_notification_status_format">Status: %1$s (Step %2$d)</string>
+    <string name="live_notification_status_ended">Status: Ended</string>
+    <string name="live_notification_auto">Run All Steps (2s each)</string>
+    <string name="live_notification_section_type">Notification Type</string>
+    <string name="live_notification_section_manual">Manual Control</string>
+    <string name="live_notification_section_auto">Auto Sequence</string>
+    <string name="live_notification_type_delivery">Delivery Tracking</string>
+    <string name="live_notification_type_timer">Parking Timer (countdown)</string>
+    <string name="live_notification_type_sports">Sports Score (no progress bar)</string>
+    <string name="live_notification_type_delivery_actions">Delivery with Actions</string>
+    <string name="live_notification_full_payload">Send full payload (include optional fields)</string>
+
 </resources>

From 11e2de4d74878cdaca5189a56041385d7d707b59 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Tue, 19 May 2026 20:32:08 +0300
Subject: [PATCH 04/10] chore: per-install installation id on every event
 (#689)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../sdk/data/store/GlobalPreferenceStore.kt   | 11 +++
 .../datapipelines/plugins/ContextPlugin.kt    | 21 ++++-
 .../main/kotlin/io/customer/sdk/CustomerIO.kt | 11 ++-
 .../plugins/ContextPluginBehaviorTest.kt      |  4 +-
 .../plugins/ContextPluginTest.kt              | 83 +++++++++++++++++++
 .../testutils/core/UnitTestDelegate.kt        |  1 +
 .../testutils/extensions/JsonExtensions.kt    |  3 +
 7 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/core/src/main/kotlin/io/customer/sdk/data/store/GlobalPreferenceStore.kt b/core/src/main/kotlin/io/customer/sdk/data/store/GlobalPreferenceStore.kt
index 2df58066c..ec448b2ac 100644
--- a/core/src/main/kotlin/io/customer/sdk/data/store/GlobalPreferenceStore.kt
+++ b/core/src/main/kotlin/io/customer/sdk/data/store/GlobalPreferenceStore.kt
@@ -12,8 +12,10 @@ import kotlinx.serialization.json.Json
 interface GlobalPreferenceStore {
     fun saveDeviceToken(token: String)
     fun saveSettings(value: Settings)
+    fun saveInstallationId(value: String)
     fun getDeviceToken(): String?
     fun getSettings(): Settings?
+    fun getInstallationId(): String?
     fun removeDeviceToken()
     fun clear(key: String)
     fun clearAll()
@@ -35,6 +37,10 @@ internal class GlobalPreferenceStoreImpl(
         putString(KEY_CONFIG_SETTINGS, Json.encodeToString(Settings.serializer(), value))
     }
 
+    override fun saveInstallationId(value: String) = prefs.edit {
+        putString(KEY_INSTALLATION_ID, value)
+    }
+
     override fun getDeviceToken(): String? = prefs.read {
         getString(KEY_DEVICE_TOKEN, null)
     }
@@ -48,10 +54,15 @@ internal class GlobalPreferenceStoreImpl(
         }.getOrNull()
     }
 
+    override fun getInstallationId(): String? = prefs.read {
+        getString(KEY_INSTALLATION_ID, null)
+    }
+
     override fun removeDeviceToken() = clear(KEY_DEVICE_TOKEN)
 
     companion object {
         private const val KEY_DEVICE_TOKEN = "device_token"
         private const val KEY_CONFIG_SETTINGS = "config_settings"
+        private const val KEY_INSTALLATION_ID = "installation_id"
     }
 }
diff --git a/datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/ContextPlugin.kt b/datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/ContextPlugin.kt
index 590684c73..0c774b9ca 100644
--- a/datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/ContextPlugin.kt
+++ b/datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/ContextPlugin.kt
@@ -14,6 +14,7 @@ import io.customer.sdk.data.store.DeviceStore
  */
 internal class ContextPlugin(
     private val deviceStore: DeviceStore,
+    private val installationId: String,
     private val eventProcessor: ContextPluginEventProcessor = DefaultContextPluginEventProcessor()
 ) : Plugin {
     override val type: Plugin.Type = Plugin.Type.Before
@@ -23,7 +24,7 @@ internal class ContextPlugin(
     internal var deviceToken: String? = null
 
     override fun execute(event: BaseEvent): BaseEvent {
-        return eventProcessor.execute(event, deviceStore) { deviceToken }
+        return eventProcessor.execute(event, deviceStore, installationId) { deviceToken }
     }
 }
 
@@ -32,7 +33,12 @@ internal class ContextPlugin(
  * Allows custom logic to be injected for testing or extension.
  */
 internal interface ContextPluginEventProcessor {
-    fun execute(event: BaseEvent, deviceStore: DeviceStore, deviceTokenProvider: () -> String?): BaseEvent
+    fun execute(
+        event: BaseEvent,
+        deviceStore: DeviceStore,
+        installationId: String,
+        deviceTokenProvider: () -> String?
+    ): BaseEvent
 }
 
 /**
@@ -40,7 +46,12 @@ internal interface ContextPluginEventProcessor {
  * in the context and ensures the device token is added if not already present.
  */
 internal class DefaultContextPluginEventProcessor : ContextPluginEventProcessor {
-    override fun execute(event: BaseEvent, deviceStore: DeviceStore, deviceTokenProvider: () -> String?): BaseEvent {
+    override fun execute(
+        event: BaseEvent,
+        deviceStore: DeviceStore,
+        installationId: String,
+        deviceTokenProvider: () -> String?
+    ): BaseEvent {
         // Set user agent in context as it is required by Customer.io Data Pipelines
         event.putInContext("userAgent", deviceStore.buildUserAgent())
         // Remove analytics library information from context as Customer.io
@@ -55,6 +66,10 @@ internal class DefaultContextPluginEventProcessor : ContextPluginEventProcessor
             event.putInContextUnderKey("device", "token", token)
         }
 
+        // Attach installation id to device in context so backend can correlate
+        // events to a single install across identify/clearIdentify cycles.
+        event.putInContextUnderKey("device", "installationId", installationId)
+
         return event
     }
 }
diff --git a/datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt b/datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt
index 10fc002df..9f6ffb7b6 100644
--- a/datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt
+++ b/datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt
@@ -41,6 +41,7 @@ import io.customer.sdk.data.model.Settings
 import io.customer.sdk.events.TrackMetric
 import io.customer.sdk.util.EventNames
 import io.customer.tracking.migration.MigrationProcessor
+import java.util.UUID
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.serializer
 
@@ -109,7 +110,7 @@ class CustomerIO private constructor(
         )
     )
 
-    private val contextPlugin: ContextPlugin = ContextPlugin(deviceStore)
+    private val contextPlugin: ContextPlugin
 
     // Tracks the last userId successfully identified in this SDK session. Used to dedup
     // back-to-back identify(userId) calls with no traits, which are no-ops server-side.
@@ -121,6 +122,14 @@ class CustomerIO private constructor(
         Analytics.debugLogsEnabled = logger.logLevel == CioLogLevel.DEBUG
         Analytics.setLogger(segmentLogger)
 
+        // Resolve installation id: load if present, otherwise generate once and persist.
+        // Survives clearIdentify and SDK re-init; only OS app-data clear wipes it.
+        val installationId = globalPreferenceStore.getInstallationId()
+            ?: UUID.randomUUID().toString().also { id ->
+                globalPreferenceStore.saveInstallationId(id)
+            }
+        contextPlugin = ContextPlugin(deviceStore = deviceStore, installationId = installationId)
+
         // Add required plugins to analytics instance
         analytics.add(contextPlugin)
 
diff --git a/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginBehaviorTest.kt b/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginBehaviorTest.kt
index c35982a6c..c25faaee2 100644
--- a/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginBehaviorTest.kt
+++ b/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginBehaviorTest.kt
@@ -65,7 +65,9 @@ class ContextPluginBehaviorTest : JUnitTest() {
     @Test
     fun execute_whenDeviceTokenIsSetFromAnotherThread_thenAddsCorrectTokenToEvent() {
         val rounds = ROUND_COUNT
-        val contextPlugin = ContextPlugin(deviceStore)
+        // #689 added a required `installationId` to ContextPlugin; the deterministic test
+        // only asserts on deviceToken propagation, so a fixed stub id is sufficient.
+        val contextPlugin = ContextPlugin(deviceStore, installationId = "test-installation-id")
         // We exercise contextPlugin.execute(event) in isolation — no need to
         // attach to analytics. ContextPlugin.execute does not touch the
         // `analytics` lateinit; attaching it under JUnitTest's StandardTestDispatcher
diff --git a/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginTest.kt b/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginTest.kt
index 1849fa423..c6950c6b8 100644
--- a/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginTest.kt
+++ b/datapipelines/src/test/java/io/customer/datapipelines/plugins/ContextPluginTest.kt
@@ -12,14 +12,19 @@ import io.customer.datapipelines.testutils.core.DataPipelinesTestConfig
 import io.customer.datapipelines.testutils.core.JUnitTest
 import io.customer.datapipelines.testutils.core.testConfiguration
 import io.customer.datapipelines.testutils.extensions.deviceToken
+import io.customer.datapipelines.testutils.extensions.installationId
 import io.customer.datapipelines.testutils.utils.OutputReaderPlugin
 import io.customer.datapipelines.testutils.utils.trackEvents
 import io.customer.sdk.core.di.SDKComponent
 import io.customer.sdk.data.store.GlobalPreferenceStore
 import io.mockk.every
+import io.mockk.slot
+import io.mockk.verify
+import java.util.UUID
 import org.amshove.kluent.shouldBeEqualTo
 import org.amshove.kluent.shouldBeNull
 import org.amshove.kluent.shouldHaveSingleItem
+import org.amshove.kluent.shouldNotBeNull
 import org.junit.jupiter.api.Test
 
 class ContextPluginTest : JUnitTest() {
@@ -97,6 +102,84 @@ class ContextPluginTest : JUnitTest() {
         result.event shouldBeEqualTo givenEventName
         result.context.deviceToken.shouldBeNull()
     }
+
+    @Test
+    fun process_givenInstallationIdExists_expectAttachedToDeviceContext() {
+        val givenInstallationId = UUID.randomUUID().toString()
+        setupWithConfig(
+            testConfiguration {
+                diGraph {
+                    android {
+                        every { globalPreferenceStore.getInstallationId() } returns givenInstallationId
+                    }
+                }
+            }
+        )
+
+        val givenEventName = String.random
+        analytics.process(TrackEvent(emptyJsonObject, givenEventName))
+
+        val result = outputReaderPlugin.trackEvents.shouldHaveSingleItem()
+        result.event shouldBeEqualTo givenEventName
+        result.context.installationId shouldBeEqualTo givenInstallationId
+    }
+
+    @Test
+    fun process_givenNoInstallationIdStored_expectGeneratedAndPersisted() {
+        val savedIdSlot = slot<String>()
+        setupWithConfig(
+            testConfiguration {
+                diGraph {
+                    android {
+                        every { globalPreferenceStore.getInstallationId() } returns null
+                        every { globalPreferenceStore.saveInstallationId(capture(savedIdSlot)) } returns Unit
+                    }
+                }
+            }
+        )
+
+        verify(exactly = 1) { globalPreferenceStore.saveInstallationId(any()) }
+        val persistedId = savedIdSlot.captured
+        // Ensure it parses as a valid UUID
+        UUID.fromString(persistedId).shouldNotBeNull()
+
+        val firstEventName = String.random
+        analytics.process(TrackEvent(emptyJsonObject, firstEventName))
+        val secondEventName = String.random
+        analytics.process(TrackEvent(emptyJsonObject, secondEventName))
+
+        val events = outputReaderPlugin.trackEvents
+        events[0].context.installationId shouldBeEqualTo persistedId
+        events[1].context.installationId shouldBeEqualTo persistedId
+    }
+
+    @Test
+    fun process_acrossClearIdentify_expectInstallationIdUnchanged() {
+        val givenInstallationId = UUID.randomUUID().toString()
+        setupWithConfig(
+            testConfiguration {
+                diGraph {
+                    android {
+                        every { globalPreferenceStore.getInstallationId() } returns givenInstallationId
+                    }
+                }
+            }
+        )
+
+        val firstEventName = String.random
+        analytics.process(TrackEvent(emptyJsonObject, firstEventName))
+        val installationIdBefore = outputReaderPlugin.trackEvents.last().context.installationId
+        outputReaderPlugin.reset()
+
+        sdkInstance.clearIdentify()
+
+        val secondEventName = String.random
+        analytics.process(TrackEvent(emptyJsonObject, secondEventName))
+        val installationIdAfter = outputReaderPlugin.trackEvents.last().context.installationId
+
+        installationIdBefore shouldBeEqualTo givenInstallationId
+        installationIdAfter shouldBeEqualTo installationIdBefore
+    }
 }
 
 private class MigrationTokenPlugin : Plugin {
diff --git a/datapipelines/src/test/java/io/customer/datapipelines/testutils/core/UnitTestDelegate.kt b/datapipelines/src/test/java/io/customer/datapipelines/testutils/core/UnitTestDelegate.kt
index fc54ecc02..342c78489 100644
--- a/datapipelines/src/test/java/io/customer/datapipelines/testutils/core/UnitTestDelegate.kt
+++ b/datapipelines/src/test/java/io/customer/datapipelines/testutils/core/UnitTestDelegate.kt
@@ -81,6 +81,7 @@ class UnitTestDelegate(
             androidSDKComponent.overrideDependency<GlobalPreferenceStore>(instance)
         }
         every { globalPreferenceStore.getDeviceToken() } returns null
+        every { globalPreferenceStore.getInstallationId() } returns null
         // Mock device store to avoid reading/writing to device store
         // Spy on the stub to provide custom implementation for the test
         val deviceStoreStub = DeviceStoreStub().getDeviceStore(androidSDKComponent.client)
diff --git a/datapipelines/src/test/java/io/customer/datapipelines/testutils/extensions/JsonExtensions.kt b/datapipelines/src/test/java/io/customer/datapipelines/testutils/extensions/JsonExtensions.kt
index 9010ed04d..e6e525393 100644
--- a/datapipelines/src/test/java/io/customer/datapipelines/testutils/extensions/JsonExtensions.kt
+++ b/datapipelines/src/test/java/io/customer/datapipelines/testutils/extensions/JsonExtensions.kt
@@ -85,6 +85,9 @@ private fun <T> Json.encode(value: T?): JsonElement = when (value) {
 internal val JsonObject.deviceToken: String?
     get() = this.getStringAtPath("device.token")
 
+internal val JsonObject.installationId: String?
+    get() = this.getStringAtPath("device.installationId")
+
 fun JsonObject.getStringAtPath(path: String): String? {
     return findAtPath(path).firstOrNull()?.content
 }

From 4a410b83f2f9b1c39adb976fd36e37bac9de5004 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Tue, 9 Jun 2026 16:49:45 +0400
Subject: [PATCH 05/10] chore: Predefined live notification templates (#676)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 messagingpush/api/messagingpush.api           |  20 +-
 .../io/customer/messagingpush/ActionData.kt   |  17 -
 .../Api36LiveNotificationBuilder.kt           |  93 +----
 .../messagingpush/BasicNotificationBuilder.kt |  12 -
 .../messagingpush/LiveNotificationHandler.kt  | 207 ++++------
 .../MessagingPushModuleConfig.kt              |  22 +-
 .../LiveNotificationBranding.kt               |  26 ++
 .../template/AuctionBidTemplate.kt            |  68 ++++
 .../template/CountdownTimerTemplate.kt        |  82 ++++
 .../template/DeliveryTrackingTemplate.kt      |  64 ++++
 .../template/FlightStatusTemplate.kt          |  83 ++++
 .../template/LiveNotificationTemplate.kt      |  36 ++
 .../template/LiveScoreTemplate.kt             |  65 ++++
 .../template/TemplateAssets.kt                |  62 +++
 .../template/TemplateRegistry.kt              |  19 +
 .../template/TemplateRenderResult.kt          |  45 +++
 .../MessagingPushModuleConfigTest.kt          |   2 +-
 .../java_layout/src/main/AndroidManifest.xml  |   1 +
 .../java_layout/sdk/CustomerIORepository.java |  16 +-
 .../LiveNotificationDemoActivity.java         | 353 +++++++++---------
 .../src/main/res/drawable/auction_camera.xml  |   9 +
 .../src/main/res/drawable/delivery_door.xml   |   9 +
 .../src/main/res/drawable/delivery_truck.xml  |   9 +
 .../main/res/drawable/delivery_warehouse.xml  |   9 +
 .../src/main/res/drawable/flash_sale_hero.xml |   9 +
 .../src/main/res/drawable/league_nba.xml      |   9 +
 .../activity_live_notification_demo.xml       |  46 ++-
 .../src/main/res/values/strings.xml           |  12 +-
 28 files changed, 969 insertions(+), 436 deletions(-)
 delete mode 100644 messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationBranding.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRenderResult.kt
 create mode 100644 samples/java_layout/src/main/res/drawable/auction_camera.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/delivery_door.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/delivery_truck.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/delivery_warehouse.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/flash_sale_hero.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/league_nba.xml

diff --git a/messagingpush/api/messagingpush.api b/messagingpush/api/messagingpush.api
index d49c894c0..5318aad56 100644
--- a/messagingpush/api/messagingpush.api
+++ b/messagingpush/api/messagingpush.api
@@ -22,8 +22,9 @@ public final class io/customer/messagingpush/CustomerIOFirebaseMessagingService$
 
 public final class io/customer/messagingpush/MessagingPushModuleConfig : io/customer/sdk/core/module/CustomerIOModuleConfig {
 	public static final field Companion Lio/customer/messagingpush/MessagingPushModuleConfig$Companion;
-	public synthetic fun <init> (ZLio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/config/PushClickBehavior;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ZLio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/config/PushClickBehavior;Lio/customer/messagingpush/livenotification/LiveNotificationBranding;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getAutoTrackPushEvents ()Z
+	public final fun getLiveNotificationBranding ()Lio/customer/messagingpush/livenotification/LiveNotificationBranding;
 	public final fun getNotificationCallback ()Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;
 	public final fun getPushClickBehavior ()Lio/customer/messagingpush/config/PushClickBehavior;
 	public fun toString ()Ljava/lang/String;
@@ -34,6 +35,7 @@ public final class io/customer/messagingpush/MessagingPushModuleConfig$Builder :
 	public fun build ()Lio/customer/messagingpush/MessagingPushModuleConfig;
 	public synthetic fun build ()Lio/customer/sdk/core/module/CustomerIOModuleConfig;
 	public final fun setAutoTrackPushEvents (Z)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
+	public final fun setLiveNotificationBranding (Lio/customer/messagingpush/livenotification/LiveNotificationBranding;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 	public final fun setNotificationCallback (Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 	public final fun setPushClickBehavior (Lio/customer/messagingpush/config/PushClickBehavior;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 }
@@ -123,6 +125,22 @@ public final class io/customer/messagingpush/di/DiGraphMessagingPushKt {
 	public static final fun getPushModuleConfig (Lio/customer/sdk/core/di/SDKComponent;)Lio/customer/messagingpush/MessagingPushModuleConfig;
 }
 
+public final class io/customer/messagingpush/livenotification/LiveNotificationBranding {
+	public fun <init> (Ljava/lang/String;ILjava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;ILjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()I
+	public final fun component3 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;ILjava/lang/String;)Lio/customer/messagingpush/livenotification/LiveNotificationBranding;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationBranding;Ljava/lang/String;ILjava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationBranding;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAccentColor ()I
+	public final fun getCompanyName ()Ljava/lang/String;
+	public final fun getLogoDrawableName ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class io/customer/messagingpush/processor/PushMessageProcessor$Companion {
 	public static final field RECENT_MESSAGES_MAX_SIZE I
 	public final fun getRecentMessagesQueue ()Ljava/util/concurrent/LinkedBlockingDeque;
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt b/messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt
deleted file mode 100644
index 35e291277..000000000
--- a/messagingpush/src/main/java/io/customer/messagingpush/ActionData.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.customer.messagingpush
-
-import android.app.PendingIntent
-
-/**
- * Represents a single action button on a live notification.
- *
- * @property label The user-visible button text (e.g. "View Order")
- * @property link Deep link URI fired when the action is tapped
- * @property pendingIntent The PendingIntent that routes through
- *           [NotificationClickReceiverActivity] for tracking and deep link handling
- */
-internal data class ActionData(
-    val label: String,
-    val link: String,
-    val pendingIntent: PendingIntent
-)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
index db0d169b6..ed131574e 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
@@ -12,10 +12,9 @@ import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.toColorInt
+import io.customer.messagingpush.livenotification.template.PointSpec
+import io.customer.messagingpush.livenotification.template.SegmentSpec
 import io.customer.sdk.core.di.SDKComponent
-import org.json.JSONArray
-import org.json.JSONException
 
 /**
  * Parameters for building a promoted live notification on API 36+ (BAKLAVA).
@@ -34,8 +33,8 @@ internal data class Api36LiveNotificationParams(
     val subText: String?,
     @DrawableRes val smallIcon: Int,
     @ColorInt val accentColor: Int?,
-    val segmentsJson: String?,
-    val pointsJson: String?,
+    val segments: List<SegmentSpec>,
+    val points: List<PointSpec>,
     val progress: Int,
     val progressMax: Int,
     @DrawableRes val startIconRes: Int?,
@@ -44,7 +43,6 @@ internal data class Api36LiveNotificationParams(
     val pendingIntent: PendingIntent?,
     val countdownUntil: Long?,
     val largeIcon: Bitmap?,
-    val actions: List<ActionData>,
     val showProgress: Boolean
 )
 
@@ -63,8 +61,6 @@ internal data class Api36LiveNotificationParams(
  */
 internal object Api36LiveNotificationBuilder {
 
-    private const val MAX_ACTIONS = 3
-
     // Notification.EXTRA_REQUEST_PROMOTED_ONGOING was added in extension SDK 36.1.
     // Use the raw string value so we can compile against base API 36.
     private const val EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing"
@@ -80,8 +76,6 @@ internal object Api36LiveNotificationBuilder {
             .setOngoing(true)
             .setOnlyAlertOnce(true)
 
-        // Request promoted ongoing status when the host app holds the permission.
-        // If missing, fall back silently to standard ongoing — the notification still posts.
         if (canPostPromotedNotifications(params.context)) {
             val extras = Bundle().apply {
                 putBoolean(EXTRA_REQUEST_PROMOTED_ONGOING, true)
@@ -96,11 +90,10 @@ internal object Api36LiveNotificationBuilder {
         if (params.showProgress) {
             builder.setCategory(Notification.CATEGORY_PROGRESS)
 
-            val segments = params.segmentsJson?.let { parseSegments(it) } ?: emptyList()
-            // When no segments are provided, create a single segment sized to progressMax
-            // so ProgressStyle knows the total range for the bar.
-            val effectiveSegments = segments.ifEmpty {
-                listOf(Notification.ProgressStyle.Segment(params.progressMax))
+            val effectiveSegments = if (params.segments.isNotEmpty()) {
+                params.segments.map { it.toSystem() }
+            } else {
+                listOf(Notification.ProgressStyle.Segment(params.progressMax.coerceAtLeast(1)))
             }
             val maxProgress = effectiveSegments.sumOf { it.length }
             val safeProgress = params.progress.coerceIn(0, maxProgress)
@@ -110,11 +103,8 @@ internal object Api36LiveNotificationBuilder {
 
             progressStyle.progressSegments = effectiveSegments
 
-            params.pointsJson?.let { json ->
-                val points = parsePoints(json, maxProgress)
-                if (points.isNotEmpty()) {
-                    progressStyle.progressPoints = points
-                }
+            if (params.points.isNotEmpty()) {
+                progressStyle.progressPoints = params.points.map { it.toSystem(maxProgress) }
             }
 
             params.startIconRes?.let { res ->
@@ -133,7 +123,6 @@ internal object Api36LiveNotificationBuilder {
             builder.style = Notification.BigTextStyle().bigText(params.body)
         }
 
-        // Countdown timer
         params.countdownUntil?.let { until ->
             builder.setWhen(until)
             builder.setUsesChronometer(true)
@@ -141,7 +130,6 @@ internal object Api36LiveNotificationBuilder {
             builder.setShowWhen(true)
         }
 
-        // Large icon
         params.largeIcon?.let { bitmap ->
             builder.setLargeIcon(Icon.createWithBitmap(bitmap))
         }
@@ -150,15 +138,6 @@ internal object Api36LiveNotificationBuilder {
         params.accentColor?.let { builder.setColor(it) }
         params.pendingIntent?.let { builder.setContentIntent(it) }
 
-        // Action buttons (Android supports max 3)
-        val actionCount = minOf(params.actions.size, MAX_ACTIONS)
-        for (i in 0 until actionCount) {
-            val action = params.actions[i]
-            builder.addAction(
-                Notification.Action.Builder(null, action.label, action.pendingIntent).build()
-            )
-        }
-
         return builder.build()
     }
 
@@ -170,52 +149,16 @@ internal object Api36LiveNotificationBuilder {
     }
 
     @RequiresApi(Build.VERSION_CODES.BAKLAVA)
-    private fun parseSegments(json: String): List<Notification.ProgressStyle.Segment> {
-        val segments = mutableListOf<Notification.ProgressStyle.Segment>()
-        try {
-            val array = JSONArray(json)
-            for (i in 0 until array.length()) {
-                val obj = array.getJSONObject(i)
-                val length = obj.optInt("length", 1).coerceAtLeast(1)
-                val segment = Notification.ProgressStyle.Segment(length)
-                val colorStr = obj.optString("color", "")
-                if (colorStr.isNotEmpty()) {
-                    try {
-                        segment.color = colorStr.toColorInt()
-                    } catch (e: IllegalArgumentException) {
-                        SDKComponent.logger.error("Invalid segment color '$colorStr': ${e.message}")
-                    }
-                }
-                segments.add(segment)
-            }
-        } catch (e: JSONException) {
-            SDKComponent.logger.error("Failed to parse live notification segments JSON: ${e.message}")
-        }
-        return segments
+    private fun SegmentSpec.toSystem(): Notification.ProgressStyle.Segment {
+        val segment = Notification.ProgressStyle.Segment(length.coerceAtLeast(1))
+        color?.let { segment.color = it }
+        return segment
     }
 
     @RequiresApi(Build.VERSION_CODES.BAKLAVA)
-    private fun parsePoints(json: String, maxProgress: Int): List<Notification.ProgressStyle.Point> {
-        val points = mutableListOf<Notification.ProgressStyle.Point>()
-        try {
-            val array = JSONArray(json)
-            for (i in 0 until array.length()) {
-                val obj = array.getJSONObject(i)
-                val position = obj.optInt("position", 0).coerceIn(0, maxProgress)
-                val point = Notification.ProgressStyle.Point(position)
-                val colorStr = obj.optString("color", "")
-                if (colorStr.isNotEmpty()) {
-                    try {
-                        point.color = colorStr.toColorInt()
-                    } catch (e: IllegalArgumentException) {
-                        SDKComponent.logger.error("Invalid point color '$colorStr': ${e.message}")
-                    }
-                }
-                points.add(point)
-            }
-        } catch (e: JSONException) {
-            SDKComponent.logger.error("Failed to parse live notification points JSON: ${e.message}")
-        }
-        return points
+    private fun PointSpec.toSystem(maxProgress: Int): Notification.ProgressStyle.Point {
+        val point = Notification.ProgressStyle.Point(position.coerceIn(0, maxProgress))
+        color?.let { point.color = it }
+        return point
     }
 }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
index 15cb2b1f0..cb8ad82de 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
@@ -39,7 +39,6 @@ internal data class BasicNotificationParams(
     val pendingIntent: PendingIntent?,
     val countdownUntil: Long?,
     val largeIcon: Bitmap?,
-    val actions: List<ActionData>,
     val showProgress: Boolean
 )
 
@@ -49,8 +48,6 @@ internal data class BasicNotificationParams(
  */
 internal object BasicNotificationBuilder {
 
-    private const val MAX_ACTIONS = 3
-
     fun build(params: BasicNotificationParams): Notification {
         val category = if (params.showProgress) {
             NotificationCompat.CATEGORY_PROGRESS
@@ -72,7 +69,6 @@ internal object BasicNotificationBuilder {
             builder.setProgress(params.progressMax, safeProgress, false)
         }
 
-        // Countdown timer
         params.countdownUntil?.let { until ->
             builder.setWhen(until)
             builder.setUsesChronometer(true)
@@ -82,7 +78,6 @@ internal object BasicNotificationBuilder {
             builder.setShowWhen(true)
         }
 
-        // Large icon
         params.largeIcon?.let { builder.setLargeIcon(it) }
 
         params.subText?.let { builder.setSubText(it) }
@@ -92,13 +87,6 @@ internal object BasicNotificationBuilder {
         }
         params.pendingIntent?.let { builder.setContentIntent(it) }
 
-        // Action buttons (Android supports max 3)
-        val actionCount = minOf(params.actions.size, MAX_ACTIONS)
-        for (i in 0 until actionCount) {
-            val action = params.actions[i]
-            builder.addAction(0, action.label, action.pendingIntent)
-        }
-
         return builder.build()
     }
 }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
index 2d5152588..b590a315a 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
@@ -5,7 +5,6 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -15,28 +14,24 @@ import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import io.customer.messagingpush.activity.NotificationClickReceiverActivity
 import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
+import io.customer.messagingpush.di.pushModuleConfig
 import io.customer.messagingpush.extensions.getDrawableByName
-import io.customer.messagingpush.extensions.toColorOrNull
-import io.customer.messagingpush.util.BitmapDownloader
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import io.customer.messagingpush.livenotification.template.TemplateRegistry
 import io.customer.sdk.core.di.SDKComponent
-import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
 /**
- * Handles live notification creation, updates, and dismissal.
+ * Dispatches templated live notifications.
  *
  * Live notifications are ongoing notifications that can be updated in-place
- * (the Android counterpart of iOS Live Activities). They use a stable
- * notification ID derived from [ACTIVITY_ID_KEY] so successive pushes
- * replace the previous notification rather than creating new ones.
- *
- * Payload schema (iOS-style split):
- * - [ACTIVITY_ID_KEY] — stable id
- * - [EVENT_KEY] — "start" | "update" | "end"
- * - [ACTIVITY_TYPE_KEY] — "progress" | "countdown" | "text"
- * - [ATTRIBUTES_KEY] — JSON string: structural/static data (progress_max, icons, etc.)
- * - [CONTENT_STATE_KEY] — JSON string: dynamic data (title, body, progress, subtext, etc.)
+ * (the Android counterpart of iOS Live Activities). Each push declares an
+ * `activity_type` (one of the closed set in [TemplateRegistry], prefixed with
+ * `io.customer.live.`) plus two JSON objects: `attributes` for static fields
+ * and `content_state` for dynamic fields. Pushes share a stable
+ * [ACTIVITY_ID_KEY] so successive updates replace the previous notification
+ * rather than creating new ones.
  */
 internal class LiveNotificationHandler(
     private val bundle: Bundle
@@ -46,11 +41,8 @@ internal class LiveNotificationHandler(
         const val ACTIVITY_ID_KEY = "activity_id"
         const val EVENT_KEY = "event"
         const val ACTIVITY_TYPE_KEY = "activity_type"
-        const val CONTENT_STATE_KEY = "content_state"
         const val ATTRIBUTES_KEY = "attributes"
-
-        private const val TYPE_PROGRESS = "progress"
-        private const val TYPE_COUNTDOWN = "countdown"
+        const val CONTENT_STATE_KEY = "content_state"
 
         private const val EVENT_END = "end"
 
@@ -66,9 +58,6 @@ internal class LiveNotificationHandler(
         channelId: String,
         notificationManager: NotificationManager
     ) {
-        // Log a warning on API 33+ if POST_NOTIFICATIONS is not granted. We do not
-        // bail out here — the system will silently drop the notification at notify()
-        // time, matching how standard push notifications behave in the same situation.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
             ContextCompat.checkSelfPermission(context, android.Manifest.permission.POST_NOTIFICATIONS)
             != PackageManager.PERMISSION_GRANTED
@@ -80,80 +69,70 @@ internal class LiveNotificationHandler(
         }
 
         val activityId = bundle.getString(ACTIVITY_ID_KEY) ?: return
-        val event = bundle.getString(EVENT_KEY) ?: "update"
-        val activityType = bundle.getString(ACTIVITY_TYPE_KEY) ?: TYPE_PROGRESS
-
-        val attributes = parseJson(ATTRIBUTES_KEY, bundle.getString(ATTRIBUTES_KEY))
-        val contentState = parseJson(CONTENT_STATE_KEY, bundle.getString(CONTENT_STATE_KEY))
-
-        // Structural fields (attributes — stable for the life of the activity)
-        val progressMax = attributes.optInt("progress_max", 100)
-        val segmentsJson = attributes.optString("segments").takeIf { it.isNotEmpty() }
-        val startIconRes = context.getDrawableByName(attributes.optString("start_icon").takeIf { it.isNotEmpty() })
-        val endIconRes = context.getDrawableByName(attributes.optString("end_icon").takeIf { it.isNotEmpty() })
-        val trackerIconRes = context.getDrawableByName(attributes.optString("tracker_icon").takeIf { it.isNotEmpty() })
-        val largeIconUrl = attributes.optString("large_icon").takeIf { it.isNotEmpty() }
-        val colorized = attributes.optBoolean("colorized", false)
-        val dismissDelay = attributes.optLong("dismiss_delay", DEFAULT_DISMISS_DELAY_MS)
-
-        // Dynamic fields (content_state — updated on every event)
-        val title = contentState.optString("title")
-        val body = contentState.optString("body")
-        val subText = contentState.optString("subtext").takeIf { it.isNotEmpty() }
-        val backgroundColor = contentState.optString("color").takeIf { it.isNotEmpty() }?.toColorOrNull()
-        val actionsJson = contentState.optString("actions").takeIf { it.isNotEmpty() }
-        val progress = contentState.optInt("progress", 0)
-        val pointsJson = contentState.optString("points").takeIf { it.isNotEmpty() }
-        val countdownUntil = if (activityType == TYPE_COUNTDOWN && contentState.has("countdown_until")) {
-            contentState.optLong("countdown_until").takeIf { it > 0 }
-        } else {
-            null
+        val activityType = bundle.getString(ACTIVITY_TYPE_KEY)
+        val template = TemplateRegistry.find(activityType)
+        if (template == null) {
+            SDKComponent.logger.error(
+                "Unknown live notification template '$activityType'; dropping push for activity '$activityId'."
+            )
+            return
         }
 
-        val showProgress = activityType == TYPE_PROGRESS
-
-        val largeIcon: Bitmap? = largeIconUrl?.let { url -> BitmapDownloader.download(url) }
+        val attributes = parseJson(bundle.getString(ATTRIBUTES_KEY))
+        val contentState = parseJson(bundle.getString(CONTENT_STATE_KEY))
+        val branding = SDKComponent.pushModuleConfig.liveNotificationBranding
+        val effectiveSmallIcon = resolveSmallIcon(context, branding, smallIcon)
+
+        val result = template.render(
+            context = context,
+            attributes = attributes,
+            contentState = contentState,
+            branding = branding,
+            smallIcon = effectiveSmallIcon,
+            fallbackTintColor = tintColor
+        )
 
         val notifId = activityId.hashCode() and 0x7FFFFFFF
+        val event = bundle.getString(EVENT_KEY) ?: "update"
 
-        bundle.putInt(CustomerIOPushNotificationHandler.NOTIFICATION_REQUEST_CODE, notifId)
+        if (result.cancelImmediately) {
+            notificationManager.cancel(activityId, notifId)
+            return
+        }
 
-        val payload = CustomerIOParsedPushPayload(
+        bundle.putInt(CustomerIOPushNotificationHandler.NOTIFICATION_REQUEST_CODE, notifId)
+        val parsedPayload = CustomerIOParsedPushPayload(
             extras = Bundle(bundle),
-            deepLink = bundle.getString(CustomerIOPushNotificationHandler.DEEP_LINK_KEY),
+            deepLink = result.deepLink ?: bundle.getString(CustomerIOPushNotificationHandler.DEEP_LINK_KEY),
             cioDeliveryId = deliveryId,
             cioDeliveryToken = deliveryToken,
-            title = title,
-            body = body,
+            title = result.title,
+            body = result.body,
             activityId = activityId
         )
-
-        val pendingIntent = createIntentForNotificationClick(context, notifId, payload)
-
-        val actions = parseActions(context, actionsJson, activityId, payload)
+        val pendingIntent = createIntentForNotificationClick(context, notifId, parsedPayload)
 
         val notification = when {
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> {
                 val params = Api36LiveNotificationParams(
                     context = context,
                     channelId = channelId,
-                    title = title,
-                    body = body,
-                    subText = subText,
-                    smallIcon = smallIcon,
-                    accentColor = backgroundColor ?: tintColor,
-                    segmentsJson = segmentsJson,
-                    pointsJson = pointsJson,
-                    progress = progress,
-                    progressMax = progressMax,
-                    startIconRes = startIconRes,
-                    endIconRes = endIconRes,
-                    trackerIconRes = trackerIconRes,
+                    title = result.title,
+                    body = result.body,
+                    subText = result.subText,
+                    smallIcon = effectiveSmallIcon,
+                    accentColor = result.accentColor,
+                    segments = result.segments,
+                    points = result.points,
+                    progress = result.progress,
+                    progressMax = result.progressMax,
+                    startIconRes = result.startIconRes,
+                    endIconRes = result.endIconRes,
+                    trackerIconRes = result.trackerIconRes,
                     pendingIntent = pendingIntent,
-                    countdownUntil = countdownUntil,
-                    largeIcon = largeIcon,
-                    actions = actions,
-                    showProgress = showProgress
+                    countdownUntil = result.countdownUntil,
+                    largeIcon = result.largeIcon,
+                    showProgress = result.showProgress
                 )
                 Api36LiveNotificationBuilder.build(params)
             }
@@ -161,19 +140,18 @@ internal class LiveNotificationHandler(
                 val params = BasicNotificationParams(
                     context = context,
                     channelId = channelId,
-                    title = title,
-                    body = body,
-                    subText = subText,
-                    smallIcon = smallIcon,
-                    accentColor = backgroundColor ?: tintColor,
-                    colorized = colorized,
-                    progress = progress,
-                    progressMax = progressMax,
+                    title = result.title,
+                    body = result.body,
+                    subText = result.subText,
+                    smallIcon = effectiveSmallIcon,
+                    accentColor = result.accentColor,
+                    colorized = result.colorized,
+                    progress = result.progress,
+                    progressMax = result.progressMax,
                     pendingIntent = pendingIntent,
-                    countdownUntil = countdownUntil,
-                    largeIcon = largeIcon,
-                    actions = actions,
-                    showProgress = showProgress
+                    countdownUntil = result.countdownUntil,
+                    largeIcon = result.largeIcon,
+                    showProgress = result.showProgress
                 )
                 BasicNotificationBuilder.build(params)
             }
@@ -184,56 +162,29 @@ internal class LiveNotificationHandler(
         if (event == EVENT_END) {
             Handler(Looper.getMainLooper()).postDelayed({
                 notificationManager.cancel(activityId, notifId)
-            }, dismissDelay)
+            }, DEFAULT_DISMISS_DELAY_MS)
         }
     }
 
-    private fun parseJson(key: String, raw: String?): JSONObject {
+    private fun parseJson(raw: String?): JSONObject {
         if (raw.isNullOrEmpty()) return JSONObject()
         return try {
             JSONObject(raw)
         } catch (e: JSONException) {
-            SDKComponent.logger.error("Failed to parse live notification '$key' JSON: ${e.message}")
+            SDKComponent.logger.error("Failed to parse live notification JSON: ${e.message}")
             JSONObject()
         }
     }
 
-    private fun parseActions(
+    @DrawableRes
+    private fun resolveSmallIcon(
         context: Context,
-        actionsJson: String?,
-        activityId: String,
-        payload: CustomerIOParsedPushPayload
-    ): List<ActionData> {
-        if (actionsJson.isNullOrBlank()) return emptyList()
-
-        val actions = mutableListOf<ActionData>()
-        try {
-            val array = JSONArray(actionsJson)
-            val count = minOf(array.length(), 3) // Android supports max 3 action buttons
-            for (i in 0 until count) {
-                val obj = array.getJSONObject(i)
-                val label = obj.optString("label", "").takeIf { it.isNotEmpty() } ?: continue
-                val link = obj.optString("link", "")
-
-                val actionPayload = CustomerIOParsedPushPayload(
-                    extras = payload.extras,
-                    deepLink = link.takeIf { it.isNotEmpty() },
-                    cioDeliveryId = payload.cioDeliveryId,
-                    cioDeliveryToken = payload.cioDeliveryToken,
-                    title = payload.title,
-                    body = payload.body,
-                    activityId = activityId
-                )
-
-                val requestCode = (activityId.hashCode() + i + 1) and 0x7FFFFFFF
-                val pendingIntent = createIntentForNotificationClick(context, requestCode, actionPayload)
-
-                actions.add(ActionData(label = label, link = link, pendingIntent = pendingIntent))
-            }
-        } catch (e: JSONException) {
-            SDKComponent.logger.error("Failed to parse live notification actions JSON: ${e.message}")
-        }
-        return actions
+        branding: LiveNotificationBranding?,
+        fallback: Int
+    ): Int {
+        val key = branding?.logoDrawableName?.takeIf { it.isNotEmpty() } ?: return fallback
+        val normalized = key.replace('-', '_')
+        return context.getDrawableByName(normalized) ?: fallback
     }
 
     private fun createIntentForNotificationClick(
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt b/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt
index 433b4b76a..fedf0aa93 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt
@@ -3,6 +3,7 @@ package io.customer.messagingpush
 import io.customer.messagingpush.config.PushClickBehavior
 import io.customer.messagingpush.config.PushClickBehavior.ACTIVITY_PREVENT_RESTART
 import io.customer.messagingpush.data.communication.CustomerIOPushNotificationCallback
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import io.customer.sdk.core.module.CustomerIOModuleConfig
 
 /**
@@ -12,16 +13,20 @@ import io.customer.sdk.core.module.CustomerIOModuleConfig
  * notifications
  * @property pushClickBehavior defines the behavior when a push notification
  * is clicked
+ * @property liveNotificationBranding app-level branding applied to templated
+ * live notifications. `null` means templates fall back to FCM metadata values.
  */
 class MessagingPushModuleConfig private constructor(
     val autoTrackPushEvents: Boolean,
     val notificationCallback: CustomerIOPushNotificationCallback?,
-    val pushClickBehavior: PushClickBehavior
+    val pushClickBehavior: PushClickBehavior,
+    val liveNotificationBranding: LiveNotificationBranding?
 ) : CustomerIOModuleConfig {
     class Builder : CustomerIOModuleConfig.Builder<MessagingPushModuleConfig> {
         private var autoTrackPushEvents: Boolean = true
         private var notificationCallback: CustomerIOPushNotificationCallback? = null
         private var pushClickBehavior: PushClickBehavior = ACTIVITY_PREVENT_RESTART
+        private var liveNotificationBranding: LiveNotificationBranding? = null
 
         /**
          * Allows to enable/disable automatic tracking of push events. Auto tracking will generate
@@ -56,17 +61,28 @@ class MessagingPushModuleConfig private constructor(
             return this
         }
 
+        /**
+         * Sets the app-level branding applied to templated live notifications.
+         *
+         * @param liveNotificationBranding branding bundle (company name, accent color, logo).
+         */
+        fun setLiveNotificationBranding(liveNotificationBranding: LiveNotificationBranding): Builder {
+            this.liveNotificationBranding = liveNotificationBranding
+            return this
+        }
+
         override fun build(): MessagingPushModuleConfig {
             return MessagingPushModuleConfig(
                 autoTrackPushEvents = autoTrackPushEvents,
                 notificationCallback = notificationCallback,
-                pushClickBehavior = pushClickBehavior
+                pushClickBehavior = pushClickBehavior,
+                liveNotificationBranding = liveNotificationBranding
             )
         }
     }
 
     override fun toString(): String {
-        return "MessagingPushModuleConfig(autoTrackPushEvents=$autoTrackPushEvents, notificationCallback=$notificationCallback, pushClickBehavior=$pushClickBehavior)"
+        return "MessagingPushModuleConfig(autoTrackPushEvents=$autoTrackPushEvents, notificationCallback=$notificationCallback, pushClickBehavior=$pushClickBehavior, liveNotificationBranding=$liveNotificationBranding)"
     }
 
     companion object {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationBranding.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationBranding.kt
new file mode 100644
index 000000000..7ea868d3d
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationBranding.kt
@@ -0,0 +1,26 @@
+package io.customer.messagingpush.livenotification
+
+import androidx.annotation.ColorInt
+
+/**
+ * App-level branding applied to live notifications.
+ *
+ * Registered once via [io.customer.messagingpush.MessagingPushModuleConfig.Builder.setLiveNotificationBranding]
+ * and shared across every templated live notification this app posts. Templates
+ * may override individual fields (e.g. accent color flips green/red for auction
+ * winning/outbid state); when they do not, these values are used.
+ *
+ * @property companyName Reserved for future templates that need to render a
+ *   company label. Not consumed by any v1 template mapping.
+ * @property accentColor Default accent color applied via [android.app.Notification.Builder.setColor].
+ * @property logoDrawableName Optional drawable resource name (looked up via
+ *   `Context.getDrawableByName`) that overrides the small icon for live
+ *   notifications only. The standard push channel still uses the small icon
+ *   declared in FCM metadata. Hyphens are normalized to underscores before
+ *   lookup so values like `cio-logo` resolve to `R.drawable.cio_logo`.
+ */
+data class LiveNotificationBranding(
+    val companyName: String,
+    @ColorInt val accentColor: Int,
+    val logoDrawableName: String? = null
+)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
new file mode 100644
index 000000000..abb92541d
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
@@ -0,0 +1,68 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import org.json.JSONObject
+
+/**
+ * `auction_bid` template — current bid + winning/outbid state.
+ *
+ * Static: itemTitle (req), itemImageKey (opt), currencySymbol (default `$`).
+ * Dynamic: currentBid (req, preformatted string), bidCount (req, int),
+ * endTime (req, epoch ms), statusMessage (req), isUserHighBidder (req, bool),
+ * userBidAmount (opt, preformatted string).
+ *
+ * Strong visual differentiation between winning (green) and outbid (red) states
+ * is conveyed via accent color + colorized notification on pre-API-36.
+ */
+internal object AuctionBidTemplate : LiveNotificationTemplate {
+
+    override val name: String = TemplateRegistry.AUCTION_BID
+
+    private const val WINNING_GREEN: Int = -0xc951c1 // #36AE3F
+    private const val OUTBID_RED: Int = -0x33ccd0 // #CC3330
+
+    override fun render(
+        context: Context,
+        attributes: JSONObject,
+        contentState: JSONObject,
+        branding: LiveNotificationBranding?,
+        smallIcon: Int,
+        fallbackTintColor: Int?
+    ): TemplateRenderResult {
+        val itemTitle = attributes.optString("itemTitle")
+        val itemImageKey = attributes.optString("itemImageKey").takeIf { it.isNotEmpty() }
+        val currencySymbol = attributes.optString("currencySymbol").takeIf { it.isNotEmpty() } ?: "$"
+        val currentBid = contentState.optString("currentBid")
+        val bidCount = contentState.optInt("bidCount", 0)
+        val endTime = contentState.optLong("endTime").takeIf { it > 0 }
+        val statusMessage = contentState.optString("statusMessage")
+        val isUserHighBidder = contentState.optBoolean("isUserHighBidder", false)
+        val userBidAmount = contentState.optString("userBidAmount").takeIf { it.isNotEmpty() }
+
+        val body = "$statusMessage · $currencySymbol$currentBid"
+        val subText = userBidAmount
+            ?.let { "Your bid: $currencySymbol$it · $bidCount bids" }
+            ?: "$bidCount bids"
+        val accentColor = if (isUserHighBidder) WINNING_GREEN else OUTBID_RED
+
+        return TemplateRenderResult(
+            title = itemTitle,
+            body = body,
+            subText = subText,
+            largeIcon = TemplateAssets.resolveBitmap(context, itemImageKey),
+            accentColor = accentColor,
+            colorized = true,
+            showProgress = false,
+            progress = 0,
+            progressMax = 0,
+            segments = emptyList(),
+            points = emptyList(),
+            startIconRes = null,
+            endIconRes = null,
+            trackerIconRes = null,
+            countdownUntil = endTime,
+            deepLink = null
+        )
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
new file mode 100644
index 000000000..7629c82c8
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
@@ -0,0 +1,82 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import org.json.JSONObject
+
+/**
+ * `countdown_timer` template — chronometer ticking toward [targetDate].
+ *
+ * Static: title (req), heroImageKey (opt).
+ * Dynamic: targetDate (req, epoch ms — extendable across pushes), statusMessage
+ * (req, label above timer), expiredMessage (opt). Post-target with no
+ * expiredMessage means the activity should hide; SDK signals this via
+ * [TemplateRenderResult.cancelImmediately].
+ */
+internal object CountdownTimerTemplate : LiveNotificationTemplate {
+
+    override val name: String = TemplateRegistry.COUNTDOWN_TIMER
+
+    override fun render(
+        context: Context,
+        attributes: JSONObject,
+        contentState: JSONObject,
+        branding: LiveNotificationBranding?,
+        smallIcon: Int,
+        fallbackTintColor: Int?
+    ): TemplateRenderResult {
+        val title = attributes.optString("title")
+        val heroImageKey = attributes.optString("heroImageKey").takeIf { it.isNotEmpty() }
+        val targetDate = contentState.optLong("targetDate").takeIf { it > 0 }
+        val statusMessage = contentState.optString("statusMessage")
+        val expiredMessage = contentState.optString("expiredMessage").takeIf { it.isNotEmpty() }
+
+        val now = System.currentTimeMillis()
+        val isPostTarget = targetDate != null && now >= targetDate
+
+        if (isPostTarget && expiredMessage == null) {
+            // Server pushed a post-target state with no message: hide the activity.
+            return TemplateRenderResult(
+                title = title,
+                body = "",
+                subText = null,
+                largeIcon = null,
+                accentColor = null,
+                colorized = false,
+                showProgress = false,
+                progress = 0,
+                progressMax = 0,
+                segments = emptyList(),
+                points = emptyList(),
+                startIconRes = null,
+                endIconRes = null,
+                trackerIconRes = null,
+                countdownUntil = null,
+                deepLink = null,
+                cancelImmediately = true
+            )
+        }
+
+        val body = if (isPostTarget) expiredMessage.orEmpty() else statusMessage
+        val countdownUntil = if (isPostTarget) null else targetDate
+
+        return TemplateRenderResult(
+            title = title,
+            body = body,
+            subText = null,
+            largeIcon = TemplateAssets.resolveBitmap(context, heroImageKey),
+            accentColor = branding?.accentColor ?: fallbackTintColor,
+            colorized = false,
+            showProgress = false,
+            progress = 0,
+            progressMax = 0,
+            segments = emptyList(),
+            points = emptyList(),
+            startIconRes = null,
+            endIconRes = null,
+            trackerIconRes = null,
+            countdownUntil = countdownUntil,
+            deepLink = null
+        )
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
new file mode 100644
index 000000000..7c2b3905a
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
@@ -0,0 +1,64 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import org.json.JSONObject
+
+/**
+ * `delivery_tracking` template — segmented progress bar over delivery stages.
+ *
+ * Static: orderId (req), recipientName (opt).
+ * Dynamic: statusMessage (req), statusImageKey (opt), stepCurrent/stepTotal (req),
+ * estimatedArrival (opt, epoch ms), driverName (opt).
+ */
+internal object DeliveryTrackingTemplate : LiveNotificationTemplate {
+
+    override val name: String = TemplateRegistry.DELIVERY_TRACKING
+
+    override fun render(
+        context: Context,
+        attributes: JSONObject,
+        contentState: JSONObject,
+        branding: LiveNotificationBranding?,
+        smallIcon: Int,
+        fallbackTintColor: Int?
+    ): TemplateRenderResult {
+        val orderId = attributes.optString("orderId")
+        val recipientName = attributes.optString("recipientName").takeIf { it.isNotEmpty() }
+        val statusMessage = contentState.optString("statusMessage")
+        val statusImageKey = contentState.optString("statusImageKey").takeIf { it.isNotEmpty() }
+        val stepCurrent = contentState.optInt("stepCurrent", 0)
+        val stepTotal = contentState.optInt("stepTotal", 1).coerceAtLeast(1)
+        val estimatedArrival = contentState.optLong("estimatedArrival").takeIf { it > 0 }
+        val driverName = contentState.optString("driverName").takeIf { it.isNotEmpty() }
+
+        val title = recipientName?.let { "Delivery for $it" } ?: "Order #$orderId"
+        val subText = when {
+            driverName != null && orderId.isNotEmpty() -> "Driver: $driverName · Order #$orderId"
+            driverName != null -> "Driver: $driverName"
+            orderId.isNotEmpty() -> "Order #$orderId"
+            else -> null
+        }
+
+        val segments = List(stepTotal) { SegmentSpec(length = 1) }
+
+        return TemplateRenderResult(
+            title = title,
+            body = statusMessage,
+            subText = subText,
+            largeIcon = TemplateAssets.resolveBitmap(context, statusImageKey),
+            accentColor = branding?.accentColor ?: fallbackTintColor,
+            colorized = false,
+            showProgress = true,
+            progress = stepCurrent.coerceIn(0, stepTotal),
+            progressMax = stepTotal,
+            segments = segments,
+            points = emptyList(),
+            startIconRes = null,
+            endIconRes = null,
+            trackerIconRes = null,
+            countdownUntil = estimatedArrival,
+            deepLink = null
+        )
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
new file mode 100644
index 000000000..cca6c58b1
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
@@ -0,0 +1,83 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import org.json.JSONObject
+
+/**
+ * `flight_status` template — flight progress with optional in-flight progress bar.
+ *
+ * Static: flightNumber, origin{code, city}, destination{code, city}.
+ * Dynamic: statusMessage (req), gate (opt), terminal (opt),
+ * scheduledDeparture/estimatedArrival (req, epoch ms), progressFraction (opt, 0–1),
+ * delayMinutes (opt).
+ */
+internal object FlightStatusTemplate : LiveNotificationTemplate {
+
+    override val name: String = TemplateRegistry.FLIGHT_STATUS
+
+    private const val DELAY_RED: Int = -0x33ccd0 // #CC3330
+
+    override fun render(
+        context: Context,
+        attributes: JSONObject,
+        contentState: JSONObject,
+        branding: LiveNotificationBranding?,
+        smallIcon: Int,
+        fallbackTintColor: Int?
+    ): TemplateRenderResult {
+        val flightNumber = attributes.optString("flightNumber")
+        val origin = attributes.optJSONObject("origin")
+        val destination = attributes.optJSONObject("destination")
+        val originCode = origin?.optString("code").orEmpty()
+        val destinationCode = destination?.optString("code").orEmpty()
+
+        val statusMessage = contentState.optString("statusMessage")
+        val gate = contentState.optString("gate").takeIf { it.isNotEmpty() }
+        val terminal = contentState.optString("terminal").takeIf { it.isNotEmpty() }
+        val scheduledDeparture = contentState.optLong("scheduledDeparture").takeIf { it > 0 }
+        val estimatedArrival = contentState.optLong("estimatedArrival").takeIf { it > 0 }
+        val progressFractionRaw =
+            if (contentState.has("progressFraction")) contentState.optDouble("progressFraction") else Double.NaN
+        val progressFraction = progressFractionRaw.takeIf { !it.isNaN() }
+        val delayMinutes = contentState.optInt("delayMinutes", 0).takeIf { it > 0 }
+
+        val title = "$flightNumber · $originCode → $destinationCode"
+        val subText = "Gate ${gate ?: "TBA"} · Terminal ${terminal ?: "TBA"}"
+        val body = if (delayMinutes != null) {
+            "$statusMessage · Delayed $delayMinutes min"
+        } else {
+            statusMessage
+        }
+
+        val showProgress = progressFraction != null
+        val progress = progressFraction
+            ?.coerceIn(0.0, 1.0)
+            ?.let { (it * 100).toInt() }
+            ?: 0
+        val countdownUntil = if (showProgress) estimatedArrival else scheduledDeparture
+        val accentColor = when {
+            delayMinutes != null -> DELAY_RED
+            else -> branding?.accentColor ?: fallbackTintColor
+        }
+
+        return TemplateRenderResult(
+            title = title,
+            body = body,
+            subText = subText,
+            largeIcon = null,
+            accentColor = accentColor,
+            colorized = false,
+            showProgress = showProgress,
+            progress = progress,
+            progressMax = 100,
+            segments = emptyList(),
+            points = emptyList(),
+            startIconRes = null,
+            endIconRes = null,
+            trackerIconRes = null,
+            countdownUntil = countdownUntil,
+            deepLink = null
+        )
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt
new file mode 100644
index 000000000..472f05b91
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt
@@ -0,0 +1,36 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import org.json.JSONObject
+
+/**
+ * Renders a single live-notification template.
+ *
+ * Each template owns its typed schema (e.g. `delivery_tracking` knows about
+ * `orderId`, `stepCurrent`, `statusImageKey`). The handler dispatches to a
+ * concrete subtype via [TemplateRegistry.find] using the `activity_type` key
+ * from the FCM envelope.
+ *
+ * Static fields arrive in the `attributes` JSON object; dynamic fields arrive
+ * in the `content_state` JSON object. Strict slotting is enforced — each
+ * template reads each documented field only from its designated slot.
+ *
+ * Sealed and `internal` — the v1 closed set of templates is the only path.
+ * Adding a template means adding a subtype to this hierarchy and an entry to
+ * [TemplateRegistry].
+ */
+internal sealed interface LiveNotificationTemplate {
+    val name: String
+
+    fun render(
+        context: Context,
+        attributes: JSONObject,
+        contentState: JSONObject,
+        branding: LiveNotificationBranding?,
+        @DrawableRes smallIcon: Int,
+        @ColorInt fallbackTintColor: Int?
+    ): TemplateRenderResult
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
new file mode 100644
index 000000000..91fb58f9d
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
@@ -0,0 +1,65 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import org.json.JSONObject
+
+/**
+ * `live_score` template — text-only live update for sports scores.
+ *
+ * Static: homeTeam{name, logoKey?}, awayTeam{name, logoKey?}, sport (ignored —
+ * Android can't change layout per sport without custom views), leagueLogoKey (opt).
+ * Dynamic: homeScore/awayScore (int), period (req), clock (opt),
+ * statusMessage (opt — overrides body for special situations).
+ *
+ * Limitation: Android exposes a single large-icon slot; we use [leagueLogoKey].
+ * Per-team logos are not rendered.
+ */
+internal object LiveScoreTemplate : LiveNotificationTemplate {
+
+    override val name: String = TemplateRegistry.LIVE_SCORE
+
+    override fun render(
+        context: Context,
+        attributes: JSONObject,
+        contentState: JSONObject,
+        branding: LiveNotificationBranding?,
+        smallIcon: Int,
+        fallbackTintColor: Int?
+    ): TemplateRenderResult {
+        val homeTeam = attributes.optJSONObject("homeTeam")
+        val awayTeam = attributes.optJSONObject("awayTeam")
+        val homeName = homeTeam?.optString("name").orEmpty()
+        val awayName = awayTeam?.optString("name").orEmpty()
+        val homeScore = contentState.optInt("homeScore", 0)
+        val awayScore = contentState.optInt("awayScore", 0)
+        val period = contentState.optString("period")
+        val clock = contentState.optString("clock").takeIf { it.isNotEmpty() }
+        val statusMessage = contentState.optString("statusMessage").takeIf { it.isNotEmpty() }
+        val leagueLogoKey = attributes.optString("leagueLogoKey").takeIf { it.isNotEmpty() }
+
+        val title = "$homeName $homeScore - $awayScore $awayName"
+        val body = statusMessage
+            ?: clock?.let { "$period · $it" }
+            ?: period
+
+        return TemplateRenderResult(
+            title = title,
+            body = body,
+            subText = null,
+            largeIcon = TemplateAssets.resolveBitmap(context, leagueLogoKey),
+            accentColor = branding?.accentColor ?: fallbackTintColor,
+            colorized = false,
+            showProgress = false,
+            progress = 0,
+            progressMax = 0,
+            segments = emptyList(),
+            points = emptyList(),
+            startIconRes = null,
+            endIconRes = null,
+            trackerIconRes = null,
+            countdownUntil = null,
+            deepLink = null
+        )
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt
new file mode 100644
index 000000000..4863e76d3
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt
@@ -0,0 +1,62 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import io.customer.messagingpush.extensions.getDrawableByName
+import io.customer.sdk.core.di.SDKComponent
+
+/**
+ * Drawable lookup + bitmap conversion shared by every template.
+ *
+ * Templates carry image keys as kebab-case strings (e.g. `delivery-warehouse`)
+ * but Android resource names only allow `[a-z0-9_]`. We normalize hyphens to
+ * underscores before delegating to [Context.getDrawableByName], so spec values
+ * resolve to the matching `R.drawable.*` entries the host app ships.
+ */
+internal object TemplateAssets {
+
+    @DrawableRes
+    fun resolveDrawable(context: Context, key: String?): Int? {
+        if (key.isNullOrBlank()) return null
+        val normalized = key.replace('-', '_')
+        val resolved = context.getDrawableByName(normalized)
+        if (resolved == null) {
+            // The key was specified but no drawable matched. This is a configuration
+            // mismatch (server pushing keys the host app hasn't bundled). The template
+            // still renders — large-icon slot stays empty per "design for absence" —
+            // but a warning surfaces so developers can diagnose missing assets.
+            SDKComponent.logger.debug(
+                "Live notification asset key '$key' did not resolve to a drawable; rendering without it."
+            )
+        }
+        return resolved
+    }
+
+    fun resolveBitmap(context: Context, key: String?): Bitmap? {
+        val res = resolveDrawable(context, key) ?: return null
+        return drawableResToBitmap(context, res)
+    }
+
+    fun drawableResToBitmap(context: Context, @DrawableRes res: Int): Bitmap? {
+        val drawable = ContextCompat.getDrawable(context, res) ?: return null
+        if (drawable is BitmapDrawable) {
+            return drawable.bitmap
+        }
+        val width = drawable.intrinsicWidth.takeIf { it > 0 } ?: 1
+        val height = drawable.intrinsicHeight.takeIf { it > 0 } ?: 1
+        return try {
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+            bitmap
+        } catch (e: Exception) {
+            SDKComponent.logger.error("Failed to convert drawable $res to bitmap: ${e.message}")
+            null
+        }
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
new file mode 100644
index 000000000..394a30b14
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
@@ -0,0 +1,19 @@
+package io.customer.messagingpush.livenotification.template
+
+internal object TemplateRegistry {
+
+    const val DELIVERY_TRACKING = "io.customer.live.delivery_tracking"
+    const val FLIGHT_STATUS = "io.customer.live.flight_status"
+    const val LIVE_SCORE = "io.customer.live.live_score"
+    const val COUNTDOWN_TIMER = "io.customer.live.countdown_timer"
+    const val AUCTION_BID = "io.customer.live.auction_bid"
+
+    fun find(name: String?): LiveNotificationTemplate? = when (name) {
+        DELIVERY_TRACKING -> DeliveryTrackingTemplate
+        FLIGHT_STATUS -> FlightStatusTemplate
+        LIVE_SCORE -> LiveScoreTemplate
+        COUNTDOWN_TIMER -> CountdownTimerTemplate
+        AUCTION_BID -> AuctionBidTemplate
+        else -> null
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRenderResult.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRenderResult.kt
new file mode 100644
index 000000000..672d9e485
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRenderResult.kt
@@ -0,0 +1,45 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.graphics.Bitmap
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+
+/**
+ * Normalized intermediate produced by every [LiveNotificationTemplate].
+ *
+ * The handler converts this into either [io.customer.messagingpush.Api36LiveNotificationParams]
+ * or [io.customer.messagingpush.BasicNotificationParams] depending on the device's
+ * API level — so this struct is the union of both target shapes.
+ *
+ * Fields that have no counterpart on the lower tier (segments, points, progress
+ * icons) are silently ignored on pre-API-36 builds.
+ */
+internal data class TemplateRenderResult(
+    val title: String,
+    val body: String,
+    val subText: String?,
+    val largeIcon: Bitmap?,
+    @ColorInt val accentColor: Int?,
+    val colorized: Boolean,
+    val showProgress: Boolean,
+    val progress: Int,
+    val progressMax: Int,
+    val segments: List<SegmentSpec>,
+    val points: List<PointSpec>,
+    @DrawableRes val startIconRes: Int?,
+    @DrawableRes val endIconRes: Int?,
+    @DrawableRes val trackerIconRes: Int?,
+    val countdownUntil: Long?,
+    val deepLink: String?,
+    val cancelImmediately: Boolean = false
+)
+
+internal data class SegmentSpec(
+    val length: Int,
+    @ColorInt val color: Int? = null
+)
+
+internal data class PointSpec(
+    val position: Int,
+    @ColorInt val color: Int? = null
+)
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt
index d70704f01..bcc8a50fe 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt
@@ -11,6 +11,6 @@ class MessagingPushModuleConfigTest : JUnit5Test() {
         val config = MessagingPushModuleConfig.default()
 
         val actual = config.toString()
-        assertEquals("MessagingPushModuleConfig(autoTrackPushEvents=true, notificationCallback=null, pushClickBehavior=ACTIVITY_PREVENT_RESTART)", actual)
+        assertEquals("MessagingPushModuleConfig(autoTrackPushEvents=true, notificationCallback=null, pushClickBehavior=ACTIVITY_PREVENT_RESTART, liveNotificationBranding=null)", actual)
     }
 }
diff --git a/samples/java_layout/src/main/AndroidManifest.xml b/samples/java_layout/src/main/AndroidManifest.xml
index 01b392db1..bd96a19b5 100644
--- a/samples/java_layout/src/main/AndroidManifest.xml
+++ b/samples/java_layout/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_PROMOTED_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <!-- network security config set to allow proxy tools to view HTTP communication for app debugging.
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
index 5bc8c3294..8d0d3a4b3 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
@@ -16,7 +16,11 @@
 import io.customer.location.LocationModuleConfig;
 import io.customer.location.LocationTrackingMode;
 import io.customer.location.ModuleLocation;
+import android.graphics.Color;
+
+import io.customer.messagingpush.MessagingPushModuleConfig;
 import io.customer.messagingpush.ModuleMessagingPushFCM;
+import io.customer.messagingpush.livenotification.LiveNotificationBranding;
 import io.customer.sdk.CustomerIO;
 import io.customer.sdk.CustomerIOConfig;
 import io.customer.sdk.CustomerIOConfigBuilder;
@@ -38,8 +42,16 @@ public void initializeSdk(SampleApplication application) {
         configureSdk(builder, sdkConfig);
 
         // Enable optional features of the SDK by adding desired modules.
-        // Enables push notification
-        builder.addCustomerIOModule(new ModuleMessagingPushFCM());
+        // Enables push notification with live-notification branding registered once at init.
+        builder.addCustomerIOModule(new ModuleMessagingPushFCM(
+                new MessagingPushModuleConfig.Builder()
+                        .setLiveNotificationBranding(new LiveNotificationBranding(
+                                "Customer.io Sample",
+                                Color.parseColor("#1B5E20"),
+                                null
+                        ))
+                        .build()
+        ));
 
         // Enables location tracking
         builder.addCustomerIOModule(new ModuleLocation(
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
index aee406aa2..a04915665 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
@@ -17,90 +17,36 @@
 import io.customer.messagingpush.CustomerIOFirebaseMessagingService;
 
 /**
- * Demo activity that simulates live notification updates by sending synthetic
- * push messages through the SDK's actual push handling code path.
+ * Demo activity that simulates templated live-notification updates by sending
+ * synthetic push messages through the SDK's actual push handling code path.
  * <p>
- * Select a notification type via radio buttons, then use manual controls
- * (Start / Update / End) or auto-run all steps with a 2-second interval.
- * <p>
- * Payloads follow the iOS-style Live Activity schema: top-level keys
- * ({@code activity_id}, {@code event}, {@code activity_type}) plus two
- * JSON blobs: {@code attributes} (structural/static) and
- * {@code content_state} (dynamic/mutable).
+ * Each scenario builds a templated FCM data bundle that matches the
+ * cross-platform live-activity envelope: top-level lifecycle keys
+ * ({@code activity_id}, {@code event}, {@code activity_type}) plus two JSON
+ * strings, {@code attributes} (static fields) and {@code content_state}
+ * (dynamic fields). The static branding bundle lives in
+ * {@code MessagingPushModuleConfig} and is registered once at SDK init.
  */
 public class LiveNotificationDemoActivity extends BaseActivity<ActivityLiveNotificationDemoBinding> {
 
     private static final String DEMO_DELIVERY_TOKEN = "demo-token-live";
     private static final long AUTO_STEP_DELAY_MS = 2000;
 
-    // Event values (lifecycle)
     private static final String EVENT_START = "start";
     private static final String EVENT_UPDATE = "update";
     private static final String EVENT_END = "end";
 
-    // Activity types (rendering mode)
-    private static final String TYPE_PROGRESS = "progress";
-    private static final String TYPE_COUNTDOWN = "countdown";
-    private static final String TYPE_TEXT = "text";
-
-    // Shared demo assets
-    private static final String DEMO_ICON = "ic_notification";
-    // Lorem Picsum — free placeholder image service (https://picsum.photos).
-    // Using a fixed image id so the demo displays the same image on every run.
-    private static final String DEMO_LARGE_ICON_URL = "https://picsum.photos/id/237/400/400.jpg";
-    private static final long DEMO_DISMISS_DELAY_MS = 5000L;
-
-    // Delivery tracking config
-    private static final String DELIVERY_ID = "demo-delivery";
-    private static final String[] DELIVERY_TITLES = {"Ordered", "Preparing", "On the way", "Delivered"};
-    private static final String[] DELIVERY_BODIES = {
-            "Your order has been placed",
-            "Your order is being prepared",
-            "Your order is on the way",
-            "Your order has been delivered"
-    };
-    private static final String[] DELIVERY_SUBTEXTS = {
-            "Estimated delivery: 30 min",
-            "Estimated delivery: 25 min",
-            "Estimated delivery: 10 min",
-            "Enjoy your meal!"
-    };
-    private static final String DELIVERY_SEGMENTS = "[{\"length\":1},{\"length\":1},{\"length\":1},{\"length\":1}]";
-    private static final String DELIVERY_COLOR = "#1B5E20";
-
-    // Sports score config
-    private static final String SPORTS_ID = "demo-sports";
-    private static final String[] SPORTS_TITLES = {"Lakers 98 - Celtics 95", "Lakers 101 - Celtics 97", "Final: Lakers 105 - Celtics 99"};
-    private static final String[] SPORTS_BODIES = {"Q4 2:30 remaining", "Q4 1:15 remaining", "Game Over"};
-    private static final String[] SPORTS_SUBTEXTS = {"Live", "Live", "Final"};
-    private static final String SPORTS_COLOR = "#4A148C";
-    private static final String SPORTS_ACTIONS =
-            "[{\"label\":\"Open Scorecard\",\"link\":\"sample://sports/game/123\"}]";
-
-    // Parking timer config
-    private static final String TIMER_ID = "demo-parking";
-    private static final String[] TIMER_TITLES = {"Parking Session", "Parking Session", "Parking Expired"};
-    private static final String[] TIMER_BODIES = {"Zone A - Spot 42", "Zone A - Spot 42", "Your session has ended"};
-    private static final String[] TIMER_SUBTEXTS = {"Time remaining", "Expiring soon", "Expired"};
-    private static final String[] TIMER_COLORS = {"#2E7D32", "#E65100", "#B71C1C"};
-    private static final String TIMER_ACTIONS =
-            "[{\"label\":\"Extend Parking\",\"link\":\"sample://parking/extend\"}]";
-
-    // Delivery with actions config
-    private static final String ACTIONS_ID = "demo-delivery-actions";
-    private static final String[] ACTIONS_TITLES = {"Order confirmed", "Preparing", "On the way", "Delivered!"};
-    private static final String[] ACTIONS_BODIES = {
-            "Restaurant received your order",
-            "Your food is being prepared",
-            "Driver is heading to you",
-            "Enjoy your meal"
-    };
-    private static final String ACTIONS_SEGMENTS = "[{\"length\":1},{\"length\":1},{\"length\":1},{\"length\":1}]";
-    private static final String ACTIONS_COLOR = "#1B5E20";
-    private static final String ACTIONS_BUTTONS =
-            "[{\"label\":\"View Order\",\"link\":\"sample://order/456\"},{\"label\":\"Get Directions\",\"link\":\"sample://directions\"}]";
-
-    private enum NotificationType { DELIVERY, TIMER, SPORTS, DELIVERY_ACTIONS }
+    // activity_type values are prefixed per the cross-platform spec.
+    private static final String ACTIVITY_TYPE_DELIVERY_TRACKING = "io.customer.live.delivery_tracking";
+    private static final String ACTIVITY_TYPE_FLIGHT_STATUS = "io.customer.live.flight_status";
+    private static final String ACTIVITY_TYPE_LIVE_SCORE = "io.customer.live.live_score";
+    private static final String ACTIVITY_TYPE_COUNTDOWN_TIMER = "io.customer.live.countdown_timer";
+    private static final String ACTIVITY_TYPE_AUCTION_BID = "io.customer.live.auction_bid";
+    private static final String ACTIVITY_TYPE_UNKNOWN = "io.customer.live.bogus";
+
+    private enum TemplateChoice {
+        DELIVERY_TRACKING, FLIGHT_STATUS, LIVE_SCORE, COUNTDOWN_TIMER, AUCTION_BID
+    }
 
     private int currentStep = 0;
     private boolean isActive = false;
@@ -120,9 +66,9 @@ protected void setupContent() {
         binding.updateButton.setOnClickListener(v -> update());
         binding.endButton.setOnClickListener(v -> end());
         binding.autoButton.setOnClickListener(v -> autoRun());
+        binding.unknownActivityTypeButton.setOnClickListener(v -> sendUnknownActivityType());
 
         binding.typeRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
-            // Reset state when switching type
             if (isActive) {
                 autoHandler.removeCallbacksAndMessages(null);
                 isActive = false;
@@ -134,20 +80,27 @@ protected void setupContent() {
         });
     }
 
-    private NotificationType getSelectedType() {
+    private TemplateChoice getSelectedTemplate() {
         int checkedId = binding.typeRadioGroup.getCheckedRadioButtonId();
-        if (checkedId == R.id.radio_timer) return NotificationType.TIMER;
-        if (checkedId == R.id.radio_sports) return NotificationType.SPORTS;
-        if (checkedId == R.id.radio_delivery_actions) return NotificationType.DELIVERY_ACTIONS;
-        return NotificationType.DELIVERY;
+        if (checkedId == R.id.radio_flight_status) return TemplateChoice.FLIGHT_STATUS;
+        if (checkedId == R.id.radio_live_score) return TemplateChoice.LIVE_SCORE;
+        if (checkedId == R.id.radio_countdown_timer) return TemplateChoice.COUNTDOWN_TIMER;
+        if (checkedId == R.id.radio_auction_bid) return TemplateChoice.AUCTION_BID;
+        return TemplateChoice.DELIVERY_TRACKING;
     }
 
     private int getStepCount() {
-        switch (getSelectedType()) {
-            case TIMER: return TIMER_TITLES.length;
-            case SPORTS: return SPORTS_TITLES.length;
-            case DELIVERY_ACTIONS: return ACTIONS_TITLES.length;
-            default: return DELIVERY_TITLES.length;
+        switch (getSelectedTemplate()) {
+            // Delivery: ordered → preparing → out-for-delivery → delivered → missing-asset edge case
+            case DELIVERY_TRACKING: return 5;
+            // Flight: pre-departure → boarding → in-flight → arrived → delay-red variant
+            case FLIGHT_STATUS: return 5;
+            case LIVE_SCORE: return 4;
+            // Countdown: pre-target → near-target → expired (with message) → post-target dismiss
+            case COUNTDOWN_TIMER: return 4;
+            // Auction: outbid → winning → outbid again → ended → no-userBidAmount variant
+            case AUCTION_BID: return 5;
+            default: return 1;
         }
     }
 
@@ -201,119 +154,175 @@ private void autoRun() {
     // --- Push construction ---
 
     private void sendPush(String event, int step) {
-        switch (getSelectedType()) {
-            case DELIVERY:
-                sendDeliveryPush(event, step);
-                break;
-            case TIMER:
-                sendTimerPush(event, step);
-                break;
-            case SPORTS:
-                sendSportsPush(event, step);
-                break;
-            case DELIVERY_ACTIONS:
-                sendDeliveryActionsPush(event, step);
-                break;
+        switch (getSelectedTemplate()) {
+            case DELIVERY_TRACKING: sendDeliveryTracking(event, step); break;
+            case FLIGHT_STATUS: sendFlightStatus(event, step); break;
+            case LIVE_SCORE: sendLiveScore(event, step); break;
+            case COUNTDOWN_TIMER: sendCountdownTimer(event, step); break;
+            case AUCTION_BID: sendAuctionBid(event, step); break;
         }
     }
 
-    private boolean isFullPayload() {
-        return binding.fullPayloadCheckbox.isChecked();
+    private void sendDeliveryTracking(String event, int step) {
+        String[] statuses = {
+                "Your order has been placed",
+                "Your order is being prepared",
+                "Your order is out for delivery",
+                "Your order has been delivered",
+                "Asset key missing — design-for-absence path"
+        };
+        // Step 4 intentionally points to a key the host app has not bundled, exercising
+        // TemplateAssets.resolveDrawable's "did not resolve" branch.
+        String[] imageKeys = {
+                "delivery_warehouse",
+                "delivery_warehouse",
+                "delivery_truck",
+                "delivery_door",
+                "unknown_key"
+        };
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            attributes.put("orderId", "ABC-1234");
+            attributes.put("recipientName", "Mahmoud");
+
+            contentState.put("statusMessage", statuses[step]);
+            contentState.put("statusImageKey", imageKeys[step]);
+            contentState.put("stepCurrent", step + 1);
+            contentState.put("stepTotal", statuses.length);
+            contentState.put("estimatedArrival", System.currentTimeMillis() + 30L * 60 * 1000);
+            if (step == 2) contentState.put("driverName", "Sam");
+        } catch (JSONException ignored) { }
+        fire(buildBundle("demo-delivery-tracking", event, ACTIVITY_TYPE_DELIVERY_TRACKING, attributes, contentState));
     }
 
-    private void sendDeliveryPush(String event, int step) {
+    private void sendFlightStatus(String event, int step) {
+        String[] statuses = {"On time", "Boarding now", "In flight", "Arrived", "Delayed at gate"};
+        Double[] progress = {null, null, 0.55, 1.0, null};
+        // Step 4 exercises the delay-red accent branch.
+        int[] delayMinutes = {0, 0, 0, 0, 25};
         JSONObject attributes = new JSONObject();
         JSONObject contentState = new JSONObject();
         try {
-            attributes.put("progress_max", DELIVERY_TITLES.length);
-            contentState.put("title", DELIVERY_TITLES[step]);
-            contentState.put("body", DELIVERY_BODIES[step]);
-            contentState.put("progress", step + 1);
-            if (isFullPayload()) {
-                attributes.put("segments", DELIVERY_SEGMENTS);
-                attributes.put("start_icon", DEMO_ICON);
-                attributes.put("end_icon", DEMO_ICON);
-                attributes.put("tracker_icon", DEMO_ICON);
-                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
-                attributes.put("colorized", true);
-                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
-                contentState.put("subtext", DELIVERY_SUBTEXTS[step]);
-                contentState.put("color", DELIVERY_COLOR);
-            }
+            JSONObject origin = new JSONObject();
+            origin.put("code", "JFK");
+            origin.put("city", "New York");
+            JSONObject destination = new JSONObject();
+            destination.put("code", "LAX");
+            destination.put("city", "Los Angeles");
+
+            attributes.put("flightNumber", "AA1234");
+            attributes.put("origin", origin);
+            attributes.put("destination", destination);
+
+            contentState.put("statusMessage", statuses[step]);
+            contentState.put("gate", step >= 1 ? "B12" : JSONObject.NULL);
+            contentState.put("terminal", step >= 1 ? "4" : JSONObject.NULL);
+            contentState.put("scheduledDeparture", System.currentTimeMillis() + 45L * 60 * 1000);
+            contentState.put("estimatedArrival", System.currentTimeMillis() + 6L * 60 * 60 * 1000);
+            if (progress[step] != null) contentState.put("progressFraction", progress[step]);
+            if (delayMinutes[step] > 0) contentState.put("delayMinutes", delayMinutes[step]);
         } catch (JSONException ignored) { }
-        fire(baseBundle(DELIVERY_ID, event, TYPE_PROGRESS, attributes, contentState));
+        fire(buildBundle("demo-flight-status", event, ACTIVITY_TYPE_FLIGHT_STATUS, attributes, contentState));
     }
 
-    private void sendTimerPush(String event, int step) {
+    private void sendLiveScore(String event, int step) {
+        int[] homeScores = {0, 14, 21, 28};
+        int[] awayScores = {0, 7, 21, 24};
+        String[] periods = {"1st Quarter", "2nd Quarter", "3rd Quarter", "FT"};
+        String[] clocks = {"12:00", "5:30", "0:42", null};
         JSONObject attributes = new JSONObject();
         JSONObject contentState = new JSONObject();
         try {
-            contentState.put("title", TIMER_TITLES[step]);
-            contentState.put("body", TIMER_BODIES[step]);
-            if (!event.equals(EVENT_END)) {
-                long countdownUntil = System.currentTimeMillis() + 5 * 1000;
-                contentState.put("countdown_until", countdownUntil);
-            }
-            if (isFullPayload()) {
-                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
-                attributes.put("colorized", true);
-                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
-                contentState.put("subtext", TIMER_SUBTEXTS[step]);
-                contentState.put("color", TIMER_COLORS[step]);
-                contentState.put("actions", TIMER_ACTIONS);
-            }
+            JSONObject homeTeam = new JSONObject();
+            homeTeam.put("name", "Lakers");
+            JSONObject awayTeam = new JSONObject();
+            awayTeam.put("name", "Celtics");
+
+            attributes.put("homeTeam", homeTeam);
+            attributes.put("awayTeam", awayTeam);
+            attributes.put("sport", "basketball");
+            attributes.put("leagueLogoKey", "league_nba");
+
+            contentState.put("homeScore", homeScores[step]);
+            contentState.put("awayScore", awayScores[step]);
+            contentState.put("period", periods[step]);
+            if (clocks[step] != null) contentState.put("clock", clocks[step]);
         } catch (JSONException ignored) { }
-        fire(baseBundle(TIMER_ID, event, TYPE_COUNTDOWN, attributes, contentState));
+        fire(buildBundle("demo-live-score", event, ACTIVITY_TYPE_LIVE_SCORE, attributes, contentState));
     }
 
-    private void sendSportsPush(String event, int step) {
+    private void sendCountdownTimer(String event, int step) {
         JSONObject attributes = new JSONObject();
         JSONObject contentState = new JSONObject();
         try {
-            contentState.put("title", SPORTS_TITLES[step]);
-            contentState.put("body", SPORTS_BODIES[step]);
-            if (isFullPayload()) {
-                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
-                attributes.put("colorized", true);
-                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
-                contentState.put("subtext", SPORTS_SUBTEXTS[step]);
-                contentState.put("color", SPORTS_COLOR);
-                contentState.put("actions", SPORTS_ACTIONS);
-            }
+            attributes.put("title", "Flash Sale");
+            attributes.put("heroImageKey", "flash_sale_hero");
+
+            // Step 0: 5 min out. Step 1: 30s out. Step 2: post-target with expired message.
+            // Step 3: post-target with NO expiredMessage — exercises cancelImmediately path.
+            long now = System.currentTimeMillis();
+            long[] offsets = {5 * 60 * 1000L, 30 * 1000L, -1, -1};
+            contentState.put("targetDate", offsets[step] >= 0 ? now + offsets[step] : now - 1000);
+            contentState.put("statusMessage", "Sale starts in");
+            if (step == 2) contentState.put("expiredMessage", "Sale is live!");
+            // step == 3: deliberately omit expiredMessage
         } catch (JSONException ignored) { }
-        fire(baseBundle(SPORTS_ID, event, TYPE_TEXT, attributes, contentState));
+        fire(buildBundle("demo-countdown-timer", event, ACTIVITY_TYPE_COUNTDOWN_TIMER, attributes, contentState));
     }
 
-    private void sendDeliveryActionsPush(String event, int step) {
+    private void sendAuctionBid(String event, int step) {
+        // Step 0: outbid, step 1: winning, step 2: outbid again, step 3: ended
+        // Step 4: user has no bid in flight — exercises subtext "no user bid" branch.
+        boolean[] highBidder = {false, true, false, false, false};
+        String[] currentBids = {"1,200", "1,250", "1,300", "1,300", "1,300"};
+        String[] userBids = {"1,150", "1,250", "1,250", "1,250", null};
+        String[] statuses = {
+                "You've been outbid",
+                "You're winning",
+                "You've been outbid",
+                "Auction ended",
+                "You haven't bid yet"
+        };
+        int[] bidCounts = {7, 8, 9, 9, 9};
         JSONObject attributes = new JSONObject();
         JSONObject contentState = new JSONObject();
         try {
-            attributes.put("progress_max", ACTIONS_TITLES.length);
-            contentState.put("title", ACTIONS_TITLES[step]);
-            contentState.put("body", ACTIONS_BODIES[step]);
-            contentState.put("progress", step + 1);
-            if (isFullPayload()) {
-                attributes.put("segments", ACTIONS_SEGMENTS);
-                attributes.put("start_icon", DEMO_ICON);
-                attributes.put("end_icon", DEMO_ICON);
-                attributes.put("large_icon", DEMO_LARGE_ICON_URL);
-                attributes.put("colorized", true);
-                attributes.put("dismiss_delay", DEMO_DISMISS_DELAY_MS);
-                int minutesRemaining = Math.max(1, (ACTIONS_TITLES.length - step) * 3);
-                contentState.put("subtext", "ETA: " + minutesRemaining + " min");
-                contentState.put("color", ACTIONS_COLOR);
-                contentState.put("actions", ACTIONS_BUTTONS);
-            }
+            attributes.put("itemTitle", "Vintage Camera");
+            attributes.put("itemImageKey", "auction_camera");
+            attributes.put("currencySymbol", "$");
+
+            contentState.put("currentBid", currentBids[step]);
+            contentState.put("bidCount", bidCounts[step]);
+            contentState.put("endTime", System.currentTimeMillis() + 10L * 60 * 1000);
+            contentState.put("statusMessage", statuses[step]);
+            contentState.put("isUserHighBidder", highBidder[step]);
+            if (userBids[step] != null) contentState.put("userBidAmount", userBids[step]);
         } catch (JSONException ignored) { }
-        Bundle bundle = baseBundle(ACTIONS_ID, event, TYPE_PROGRESS, attributes, contentState);
-        if (isFullPayload()) {
-            bundle.putString("link", "sample://order/456/details");
-        }
+        fire(buildBundle("demo-auction-bid", event, ACTIVITY_TYPE_AUCTION_BID, attributes, contentState));
+    }
+
+    private void sendUnknownActivityType() {
+        // Exercises LiveNotificationHandler's "Unknown live notification template" log path.
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        Bundle bundle = buildBundle(
+                "demo-unknown-activity-type",
+                EVENT_START,
+                ACTIVITY_TYPE_UNKNOWN,
+                attributes,
+                contentState
+        );
         fire(bundle);
     }
 
-    private Bundle baseBundle(String activityId, String event, String activityType,
-                              JSONObject attributes, JSONObject contentState) {
+    private Bundle buildBundle(
+            String activityId,
+            String event,
+            String activityType,
+            JSONObject attributes,
+            JSONObject contentState
+    ) {
         Bundle bundle = new Bundle();
         bundle.putString("CIO-Delivery-ID", UUID.randomUUID().toString());
         bundle.putString("CIO-Delivery-Token", DEMO_DELIVERY_TOKEN);
@@ -341,15 +350,7 @@ private void updateButtonStates() {
     }
 
     private void updateStatusText() {
-        NotificationType type = getSelectedType();
-        String label;
-        switch (type) {
-            case TIMER: label = TIMER_TITLES[currentStep]; break;
-            case SPORTS: label = SPORTS_TITLES[currentStep]; break;
-            case DELIVERY_ACTIONS: label = ACTIONS_TITLES[currentStep]; break;
-            default: label = DELIVERY_TITLES[currentStep]; break;
-        }
-        binding.statusTextView.setText(getString(R.string.live_notification_status_format, label, currentStep + 1));
+        binding.statusTextView.setText(getString(R.string.live_notification_status_format, getSelectedTemplate().name(), currentStep + 1));
     }
 
     @Override
diff --git a/samples/java_layout/src/main/res/drawable/auction_camera.xml b/samples/java_layout/src/main/res/drawable/auction_camera.xml
new file mode 100644
index 000000000..adeb9a7b8
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/auction_camera.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M4,4H7L9,2H15L17,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M12,7A5,5 0 0,0 7,12A5,5 0 0,0 12,17A5,5 0 0,0 17,12A5,5 0 0,0 12,7M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9Z"
+        android:fillColor="#37474F" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/delivery_door.xml b/samples/java_layout/src/main/res/drawable/delivery_door.xml
new file mode 100644
index 000000000..fc7674b61
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/delivery_door.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z"
+        android:fillColor="#6A1B9A" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/delivery_truck.xml b/samples/java_layout/src/main/res/drawable/delivery_truck.xml
new file mode 100644
index 000000000..0ee16f3e3
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/delivery_truck.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M3,4A1,1 0 0,0 2,5V17H4A3,3 0 0,1 7,14A3,3 0 0,1 10,17H14A3,3 0 0,1 17,14A3,3 0 0,1 20,17H22V12L19,8H17V4M14,5.5L16.5,8L14,8M7,15.5A1.5,1.5 0 0,1 8.5,17A1.5,1.5 0 0,1 7,18.5A1.5,1.5 0 0,1 5.5,17A1.5,1.5 0 0,1 7,15.5M17,15.5A1.5,1.5 0 0,1 18.5,17A1.5,1.5 0 0,1 17,18.5A1.5,1.5 0 0,1 15.5,17A1.5,1.5 0 0,1 17,15.5Z"
+        android:fillColor="#1565C0" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/delivery_warehouse.xml b/samples/java_layout/src/main/res/drawable/delivery_warehouse.xml
new file mode 100644
index 000000000..3e45f12f5
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/delivery_warehouse.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M3,21V8L12,3L21,8V21H3M5,19H19V9L12,5L5,9V19M7,11H17V13H7V11M7,15H17V17H7V15Z"
+        android:fillColor="#1B5E20" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/flash_sale_hero.xml b/samples/java_layout/src/main/res/drawable/flash_sale_hero.xml
new file mode 100644
index 000000000..c6ae374f8
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/flash_sale_hero.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M7,2V13H10V22L17,10H13L17,2H7Z"
+        android:fillColor="#FFB300" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/league_nba.xml b/samples/java_layout/src/main/res/drawable/league_nba.xml
new file mode 100644
index 000000000..ade51077a
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/league_nba.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,2C17.5,2 22,6.5 22,12C22,17.5 17.5,22 12,22C6.5,22 2,17.5 2,12C2,6.5 6.5,2 12,2M4.04,11H7.06C7.13,9.18 7.5,7.4 8.21,5.79C5.78,7.04 4.31,9.07 4.04,11M11,4.07C9.95,5.83 9.21,7.86 9.07,11H11V4.07M13,4.07V11H14.93C14.79,7.86 14.05,5.83 13,4.07M19.96,11C19.69,9.07 18.22,7.04 15.79,5.79C16.5,7.4 16.87,9.18 16.94,11H19.96M11,13H9.07C9.21,16.14 9.95,18.17 11,19.93V13M13,13V19.93C14.05,18.17 14.79,16.14 14.93,13H13M15.79,18.21C18.22,16.96 19.69,14.93 19.96,13H16.94C16.87,14.82 16.5,16.6 15.79,18.21M8.21,18.21C7.5,16.6 7.13,14.82 7.06,13H4.04C4.31,14.93 5.78,16.96 8.21,18.21Z"
+        android:fillColor="#E65100" />
+</vector>
diff --git a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
index 894390420..b49a28b37 100644
--- a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
+++ b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
@@ -48,39 +48,37 @@
             android:orientation="vertical">
 
             <RadioButton
-                android:id="@+id/radio_delivery"
+                android:id="@+id/radio_delivery_tracking"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="true"
-                android:text="@string/live_notification_type_delivery" />
+                android:text="@string/live_notification_type_delivery_tracking" />
 
             <RadioButton
-                android:id="@+id/radio_timer"
+                android:id="@+id/radio_flight_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/live_notification_type_timer" />
+                android:text="@string/live_notification_type_flight_status" />
 
             <RadioButton
-                android:id="@+id/radio_sports"
+                android:id="@+id/radio_live_score"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/live_notification_type_sports" />
+                android:text="@string/live_notification_type_live_score" />
 
             <RadioButton
-                android:id="@+id/radio_delivery_actions"
+                android:id="@+id/radio_countdown_timer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/live_notification_type_delivery_actions" />
+                android:text="@string/live_notification_type_countdown_timer" />
 
-        </RadioGroup>
+            <RadioButton
+                android:id="@+id/radio_auction_bid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/live_notification_type_auction_bid" />
 
-        <com.google.android.material.checkbox.MaterialCheckBox
-            android:id="@+id/full_payload_checkbox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:checked="true"
-            android:text="@string/live_notification_full_payload" />
+        </RadioGroup>
 
         <!-- Manual controls -->
         <TextView
@@ -132,5 +130,21 @@
             android:layout_marginTop="@dimen/margin_default"
             android:text="@string/live_notification_auto" />
 
+        <!-- Debug controls -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/live_notification_section_debug"
+            android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
+
+        <Button
+            android:id="@+id/unknown_activity_type_button"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:text="@string/live_notification_debug_unknown_activity_type" />
+
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/samples/java_layout/src/main/res/values/strings.xml b/samples/java_layout/src/main/res/values/strings.xml
index 8b40639ee..3173c4447 100644
--- a/samples/java_layout/src/main/res/values/strings.xml
+++ b/samples/java_layout/src/main/res/values/strings.xml
@@ -170,10 +170,12 @@
     <string name="live_notification_section_type">Notification Type</string>
     <string name="live_notification_section_manual">Manual Control</string>
     <string name="live_notification_section_auto">Auto Sequence</string>
-    <string name="live_notification_type_delivery">Delivery Tracking</string>
-    <string name="live_notification_type_timer">Parking Timer (countdown)</string>
-    <string name="live_notification_type_sports">Sports Score (no progress bar)</string>
-    <string name="live_notification_type_delivery_actions">Delivery with Actions</string>
-    <string name="live_notification_full_payload">Send full payload (include optional fields)</string>
+    <string name="live_notification_type_delivery_tracking">Delivery Tracking</string>
+    <string name="live_notification_type_flight_status">Flight Status</string>
+    <string name="live_notification_type_live_score">Live Score</string>
+    <string name="live_notification_type_countdown_timer">Countdown Timer</string>
+    <string name="live_notification_type_auction_bid">Auction Bid</string>
+    <string name="live_notification_section_debug">Debug</string>
+    <string name="live_notification_debug_unknown_activity_type">Fire unknown activity_type</string>
 
 </resources>

From bb2c5c01bdcd847f6e1f912de1de9fbc62e7d6b5 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Tue, 9 Jun 2026 16:50:03 +0400
Subject: [PATCH 06/10] test: cover live notification envelope and per-template
 rendering (#690)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../LiveNotificationHandlerTest.kt            | 261 ++++++++++++++++++
 .../template/AuctionBidTemplateTest.kt        | 197 +++++++++++++
 .../template/CountdownTimerTemplateTest.kt    | 150 ++++++++++
 .../template/DeliveryTrackingTemplateTest.kt  | 209 ++++++++++++++
 .../template/FlightStatusTemplateTest.kt      | 180 ++++++++++++
 .../template/LiveScoreTemplateTest.kt         | 151 ++++++++++
 .../template/TemplateAssetsTest.kt            | 119 ++++++++
 7 files changed, 1267 insertions(+)
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateAssetsTest.kt

diff --git a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
new file mode 100644
index 000000000..4b49f70e4
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
@@ -0,0 +1,261 @@
+package io.customer.messagingpush
+
+import android.app.Notification
+import android.app.NotificationManager
+import android.os.Bundle
+import io.customer.commontest.extensions.assertCalledNever
+import io.customer.messagingpush.livenotification.template.TemplateRegistry
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows
+import org.robolectric.shadows.ShadowLooper
+
+/**
+ * Tests for [LiveNotificationHandler] focused on envelope parsing and dispatch:
+ *
+ * - top-level wire keys (`activity_id`, `event`, `activity_type`, `attributes`,
+ *   `content_state`) are read from the [Bundle];
+ * - `attributes` and `content_state` are decoded into independent JSONObjects;
+ * - unknown / missing `activity_type` and `activity_id` are dropped without
+ *   posting a notification;
+ * - `event = "end"` schedules a delayed cancel.
+ *
+ * The actual rendered notification is opaque to these tests — that's covered by
+ * the per-template render tests. Here we only assert the dispatch contract.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class LiveNotificationHandlerTest : IntegrationTest() {
+
+    private val notificationManager: NotificationManager = mockk(relaxed = true)
+    private val channelId = "live-notifications"
+
+    private fun newBundle(
+        activityId: String? = "live-act-1",
+        event: String? = "start",
+        activityType: String? = TemplateRegistry.DELIVERY_TRACKING,
+        attributesJson: String? = "{}",
+        contentStateJson: String? = "{}"
+    ): Bundle {
+        val bundle = Bundle()
+        if (activityId != null) bundle.putString(LiveNotificationHandler.ACTIVITY_ID_KEY, activityId)
+        if (event != null) bundle.putString(LiveNotificationHandler.EVENT_KEY, event)
+        if (activityType != null) bundle.putString(LiveNotificationHandler.ACTIVITY_TYPE_KEY, activityType)
+        if (attributesJson != null) bundle.putString(LiveNotificationHandler.ATTRIBUTES_KEY, attributesJson)
+        if (contentStateJson != null) bundle.putString(LiveNotificationHandler.CONTENT_STATE_KEY, contentStateJson)
+        return bundle
+    }
+
+    private fun handlerFor(bundle: Bundle): LiveNotificationHandler = LiveNotificationHandler(bundle)
+
+    private fun invoke(handler: LiveNotificationHandler) {
+        handler.handle(
+            context = contextMock,
+            deliveryId = "delivery-id-1",
+            deliveryToken = "delivery-token-1",
+            smallIcon = 0,
+            tintColor = null,
+            channelId = channelId,
+            notificationManager = notificationManager
+        )
+    }
+
+    // --- Envelope keys are exactly as documented ---
+
+    @Test
+    fun envelopeKeys_areTheCrossPlatformSpecKeys() {
+        // Lock the wire-format constants so any future rename surfaces here.
+        // Failure to update both the SDK and CIO backend would silently break live notifications.
+        assert(LiveNotificationHandler.ACTIVITY_ID_KEY == "activity_id")
+        assert(LiveNotificationHandler.EVENT_KEY == "event")
+        assert(LiveNotificationHandler.ACTIVITY_TYPE_KEY == "activity_type")
+        assert(LiveNotificationHandler.ATTRIBUTES_KEY == "attributes")
+        assert(LiveNotificationHandler.CONTENT_STATE_KEY == "content_state")
+    }
+
+    // --- Happy-path dispatch ---
+
+    @Test
+    fun handle_givenAllFiveTemplates_postsNotificationForEach() {
+        val templates = listOf(
+            TemplateRegistry.DELIVERY_TRACKING,
+            TemplateRegistry.FLIGHT_STATUS,
+            TemplateRegistry.LIVE_SCORE,
+            TemplateRegistry.COUNTDOWN_TIMER,
+            TemplateRegistry.AUCTION_BID
+        )
+        for (activityType in templates) {
+            val bundle = newBundle(
+                activityType = activityType,
+                attributesJson = "{}",
+                contentStateJson = "{}"
+            )
+            invoke(handlerFor(bundle))
+        }
+
+        verify(exactly = templates.size) {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_postsNotificationKeyedByActivityIdHash() {
+        val activityId = "live-activity-id-xyz"
+        val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
+        val bundle = newBundle(
+            activityId = activityId,
+            attributesJson = """{"orderId":"A-1","recipientName":"User"}""",
+            contentStateJson = """{"statusMessage":"Out for delivery","stepCurrent":2,"stepTotal":4}"""
+        )
+
+        invoke(handlerFor(bundle))
+
+        verify(exactly = 1) {
+            notificationManager.notify(activityId, expectedNotifId, any<Notification>())
+        }
+    }
+
+    // --- Missing required fields short-circuit ---
+
+    @Test
+    fun handle_givenMissingActivityId_returnsEarlyWithoutNotifying() {
+        val bundle = newBundle(activityId = null)
+
+        invoke(handlerFor(bundle))
+
+        assertCalledNever {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenMissingActivityType_dropsAndDoesNotNotify() {
+        val bundle = newBundle(activityType = null)
+
+        invoke(handlerFor(bundle))
+
+        assertCalledNever {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenUnknownActivityType_dropsAndDoesNotNotify() {
+        val bundle = newBundle(activityType = "io.customer.live.bogus")
+
+        invoke(handlerFor(bundle))
+
+        assertCalledNever {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenBareTemplateNameWithoutSpecPrefix_dropsAndDoesNotNotify() {
+        // The cross-platform spec requires the `io.customer.live.` prefix.
+        // Bare names like "delivery_tracking" must be rejected to stay aligned with iOS.
+        val bundle = newBundle(activityType = "delivery_tracking")
+
+        invoke(handlerFor(bundle))
+
+        assertCalledNever {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    // --- Malformed JSON tolerated ---
+
+    @Test
+    fun handle_givenMalformedAttributesJson_stillPostsNotification() {
+        // Lenient parsing — malformed JSON in one slot becomes an empty JSONObject so
+        // the template still attempts to render with defaults rather than dropping the push.
+        val bundle = newBundle(
+            attributesJson = "{this is not json",
+            contentStateJson = "{}"
+        )
+
+        invoke(handlerFor(bundle))
+
+        verify(exactly = 1) {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenMalformedContentStateJson_stillPostsNotification() {
+        val bundle = newBundle(
+            attributesJson = "{}",
+            contentStateJson = "}not json{"
+        )
+
+        invoke(handlerFor(bundle))
+
+        verify(exactly = 1) {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenNullAttributesAndContentState_stillPostsNotification() {
+        val bundle = newBundle(
+            attributesJson = null,
+            contentStateJson = null
+        )
+
+        invoke(handlerFor(bundle))
+
+        verify(exactly = 1) {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    // --- End event dismisses after the documented delay ---
+
+    @Test
+    fun handle_givenEventEnd_schedulesDelayedCancel() {
+        val activityId = "ending-activity"
+        val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
+        val bundle = newBundle(
+            activityId = activityId,
+            event = "end"
+        )
+
+        invoke(handlerFor(bundle))
+
+        // Notification was posted immediately and a cancel was queued on the main looper.
+        verify(exactly = 1) {
+            notificationManager.notify(activityId, expectedNotifId, any<Notification>())
+        }
+        assertCalledNever {
+            notificationManager.cancel(activityId, expectedNotifId)
+        }
+
+        // Drain the main looper to execute the postDelayed dismiss task.
+        Shadows.shadowOf(android.os.Looper.getMainLooper()).runToEndOfTasks()
+        ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
+
+        verify(exactly = 1) {
+            notificationManager.cancel(activityId, expectedNotifId)
+        }
+    }
+
+    @Test
+    fun handle_givenEventStart_doesNotScheduleCancel() {
+        val activityId = "starting-activity"
+        val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
+        val bundle = newBundle(activityId = activityId, event = "start")
+
+        invoke(handlerFor(bundle))
+        ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
+
+        verify(exactly = 1) {
+            notificationManager.notify(activityId, expectedNotifId, any<Notification>())
+        }
+        assertCalledNever {
+            notificationManager.cancel(activityId, expectedNotifId)
+        }
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt
new file mode 100644
index 000000000..4f1e1c1d6
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt
@@ -0,0 +1,197 @@
+package io.customer.messagingpush.livenotification.template
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeTrue
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Tests for [AuctionBidTemplate].
+ *
+ * Locks the two visual-state branches that templates lean on for state
+ * differentiation: high-bidder (green) vs outbid (red), and the user-bid-amount
+ * subtext toggle.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class AuctionBidTemplateTest : IntegrationTest() {
+
+    private val winningGreen = -0xc951c1 // #36AE3F
+    private val outbidRed = -0x33ccd0 // #CC3330
+
+    private fun render(
+        attributes: JSONObject = JSONObject(),
+        contentState: JSONObject = JSONObject()
+    ): TemplateRenderResult = AuctionBidTemplate.render(
+        context = contextMock,
+        attributes = attributes,
+        contentState = contentState,
+        branding = null,
+        smallIcon = 0,
+        fallbackTintColor = null
+    )
+
+    private fun baseAttributes() = JSONObject().apply {
+        put("itemTitle", "Vintage Camera")
+        put("itemImageKey", "auction_camera")
+        put("currencySymbol", "$")
+    }
+
+    @Test
+    fun render_userIsHighBidder_setsGreenAccent() {
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,250")
+            put("bidCount", 8)
+            put("endTime", 1700000000000L)
+            put("statusMessage", "You're winning")
+            put("isUserHighBidder", true)
+            put("userBidAmount", "1,250")
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.accentColor shouldBeEqualTo winningGreen
+        result.colorized.shouldBeTrue()
+    }
+
+    @Test
+    fun render_userIsNotHighBidder_setsRedAccent() {
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,200")
+            put("bidCount", 7)
+            put("statusMessage", "You've been outbid")
+            put("isUserHighBidder", false)
+            put("userBidAmount", "1,150")
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.accentColor shouldBeEqualTo outbidRed
+    }
+
+    @Test
+    fun render_withUserBidAmount_subTextIncludesBidAndCount() {
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,200")
+            put("bidCount", 7)
+            put("statusMessage", "You've been outbid")
+            put("userBidAmount", "1,150")
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.subText shouldBeEqualTo "Your bid: $1,150 · 7 bids"
+    }
+
+    @Test
+    fun render_withoutUserBidAmount_subTextIsBidCountOnly() {
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,200")
+            put("bidCount", 7)
+            put("statusMessage", "Auction live")
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.subText shouldBeEqualTo "7 bids"
+    }
+
+    @Test
+    fun render_emptyUserBidAmount_subTextIsBidCountOnly() {
+        // Empty string is treated as absent by the template (takeIf isNotEmpty).
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,200")
+            put("bidCount", 9)
+            put("statusMessage", "x")
+            put("userBidAmount", "")
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.subText shouldBeEqualTo "9 bids"
+    }
+
+    @Test
+    fun render_defaultsCurrencySymbolToDollar() {
+        val attributes = JSONObject().apply {
+            put("itemTitle", "Vintage Camera")
+        }
+        val contentState = JSONObject().apply {
+            put("currentBid", "100")
+            put("bidCount", 1)
+            put("statusMessage", "Start")
+        }
+
+        val result = render(attributes, contentState)
+
+        result.body shouldBeEqualTo "Start · $100"
+    }
+
+    @Test
+    fun render_bodyComposesStatusMessageAndCurrentBid() {
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,300")
+            put("bidCount", 9)
+            put("statusMessage", "You've been outbid")
+            put("isUserHighBidder", false)
+            put("userBidAmount", "1,250")
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.body shouldBeEqualTo "You've been outbid · $1,300"
+    }
+
+    @Test
+    fun render_endTimeNonPositive_countdownUntilIsNull() {
+        val contentState = JSONObject().apply {
+            put("currentBid", "1")
+            put("bidCount", 0)
+            put("statusMessage", "x")
+            put("endTime", 0L)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        (result.countdownUntil == null).shouldBeTrue()
+    }
+
+    // --- Strict-slotting regression guards ---
+
+    @Test
+    fun render_isUserHighBidderInAttributes_isIgnored() {
+        val attributes = baseAttributes().apply {
+            put("isUserHighBidder", true) // wrong slot
+        }
+        val contentState = JSONObject().apply {
+            put("currentBid", "1,000")
+            put("bidCount", 1)
+            put("statusMessage", "x")
+            // Note: no isUserHighBidder here, so it defaults to false → red.
+        }
+
+        val result = render(attributes, contentState)
+
+        result.accentColor shouldBeEqualTo outbidRed
+    }
+
+    @Test
+    fun render_currencySymbolInContentState_isIgnoredAndDefaultsApply() {
+        val attributes = JSONObject().apply {
+            put("itemTitle", "x") // no currencySymbol in attributes
+        }
+        val contentState = JSONObject().apply {
+            put("currencySymbol", "€") // wrong slot
+            put("currentBid", "1")
+            put("bidCount", 1)
+            put("statusMessage", "x")
+        }
+
+        val result = render(attributes, contentState)
+
+        // The misplaced currency symbol must be ignored; default `$` is applied.
+        result.body shouldBeEqualTo "x · $1"
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt
new file mode 100644
index 000000000..e58df4d17
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt
@@ -0,0 +1,150 @@
+package io.customer.messagingpush.livenotification.template
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeFalse
+import org.amshove.kluent.shouldBeNull
+import org.amshove.kluent.shouldBeTrue
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Tests for [CountdownTimerTemplate].
+ *
+ * Exercises the three decision branches:
+ * - pre-target (`now < targetDate`) ⇒ body = `statusMessage`, countdownUntil = targetDate;
+ * - post-target with `expiredMessage` ⇒ body = `expiredMessage`, countdownUntil = null;
+ * - post-target without `expiredMessage` ⇒ `cancelImmediately = true` so the
+ *   handler can dismiss the activity rather than render a stale countdown.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class CountdownTimerTemplateTest : IntegrationTest() {
+
+    private fun render(
+        attributes: JSONObject = JSONObject(),
+        contentState: JSONObject = JSONObject()
+    ): TemplateRenderResult = CountdownTimerTemplate.render(
+        context = contextMock,
+        attributes = attributes,
+        contentState = contentState,
+        branding = null,
+        smallIcon = 0,
+        fallbackTintColor = null
+    )
+
+    private fun titleAttributes(title: String = "Flash Sale") = JSONObject().apply {
+        put("title", title)
+        put("heroImageKey", "flash_sale_hero")
+    }
+
+    @Test
+    fun render_preTarget_setsCountdownAndStatusBody() {
+        val future = System.currentTimeMillis() + 60_000L
+        val contentState = JSONObject().apply {
+            put("targetDate", future)
+            put("statusMessage", "Sale starts in")
+        }
+
+        val result = render(titleAttributes(), contentState)
+
+        result.title shouldBeEqualTo "Flash Sale"
+        result.body shouldBeEqualTo "Sale starts in"
+        result.countdownUntil shouldBeEqualTo future
+        result.cancelImmediately.shouldBeFalse()
+    }
+
+    @Test
+    fun render_postTargetWithExpiredMessage_swapsBodyAndClearsCountdown() {
+        val past = System.currentTimeMillis() - 60_000L
+        val contentState = JSONObject().apply {
+            put("targetDate", past)
+            put("statusMessage", "Sale starts in")
+            put("expiredMessage", "Sale is live!")
+        }
+
+        val result = render(titleAttributes(), contentState)
+
+        result.body shouldBeEqualTo "Sale is live!"
+        result.countdownUntil.shouldBeNull()
+        result.cancelImmediately.shouldBeFalse()
+    }
+
+    @Test
+    fun render_postTargetWithoutExpiredMessage_flagsCancelImmediately() {
+        val past = System.currentTimeMillis() - 60_000L
+        val contentState = JSONObject().apply {
+            put("targetDate", past)
+            put("statusMessage", "Sale starts in")
+        }
+
+        val result = render(titleAttributes(), contentState)
+
+        result.cancelImmediately.shouldBeTrue()
+        // When cancelImmediately = true, the rest of the result is irrelevant because
+        // the handler short-circuits before rendering. We assert nothing else here.
+    }
+
+    @Test
+    fun render_targetDateAbsent_isTreatedAsPreTarget() {
+        // Spec: targetDate is required. Lenient parsing — missing targetDate must not
+        // crash; should render with countdownUntil = null and body = statusMessage.
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Sale starts in")
+        }
+
+        val result = render(titleAttributes(), contentState)
+
+        result.body shouldBeEqualTo "Sale starts in"
+        result.countdownUntil.shouldBeNull()
+        result.cancelImmediately.shouldBeFalse()
+    }
+
+    @Test
+    fun render_emptyHeroImageKey_returnsNullLargeIcon() {
+        val attributes = JSONObject().apply {
+            put("title", "x")
+        }
+        val contentState = JSONObject().apply {
+            put("statusMessage", "x")
+        }
+
+        val result = render(attributes, contentState)
+
+        result.largeIcon.shouldBeNull()
+    }
+
+    // --- Strict-slotting regression guards ---
+
+    @Test
+    fun render_titleInContentState_isIgnored() {
+        val attributes = JSONObject() // intentionally empty: no title
+        val contentState = JSONObject().apply {
+            put("title", "MISPLACED")
+            put("targetDate", System.currentTimeMillis() + 60_000L)
+            put("statusMessage", "msg")
+        }
+
+        val result = render(attributes, contentState)
+
+        result.title shouldBeEqualTo "" // empty, because the misplaced value is ignored
+    }
+
+    @Test
+    fun render_targetDateInAttributes_isIgnored() {
+        val past = System.currentTimeMillis() - 60_000L
+        val attributes = titleAttributes().apply {
+            put("targetDate", past) // wrong slot
+        }
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Pre-sale")
+        }
+
+        val result = render(attributes, contentState)
+
+        // No targetDate seen by the template ⇒ treated as pre-target with statusMessage.
+        result.body shouldBeEqualTo "Pre-sale"
+        result.cancelImmediately.shouldBeFalse()
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt
new file mode 100644
index 000000000..50ce9364c
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt
@@ -0,0 +1,209 @@
+package io.customer.messagingpush.livenotification.template
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeFalse
+import org.amshove.kluent.shouldBeNull
+import org.amshove.kluent.shouldBeTrue
+import org.amshove.kluent.shouldContain
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Tests [DeliveryTrackingTemplate] rendering against the documented per-slot schema.
+ *
+ * The template lives behind the strict-slotting decision: `orderId` and
+ * `recipientName` arrive only in `attributes`; everything dynamic arrives in
+ * `content_state`. Mis-slotted fields must be silently ignored so the rendering
+ * stays predictable as the cross-platform spec evolves.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class DeliveryTrackingTemplateTest : IntegrationTest() {
+
+    private fun render(
+        attributes: JSONObject = JSONObject(),
+        contentState: JSONObject = JSONObject()
+    ): TemplateRenderResult = DeliveryTrackingTemplate.render(
+        context = contextMock,
+        attributes = attributes,
+        contentState = contentState,
+        branding = null,
+        smallIcon = 0,
+        fallbackTintColor = null
+    )
+
+    @Test
+    fun render_givenAllFields_producesTitleBodySubTextAndProgress() {
+        val attributes = JSONObject().apply {
+            put("orderId", "ORD-42")
+            put("recipientName", "Alex")
+        }
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Out for delivery")
+            put("statusImageKey", "delivery_truck")
+            put("stepCurrent", 2)
+            put("stepTotal", 4)
+            put("estimatedArrival", 1700000000000L)
+            put("driverName", "Pat")
+        }
+
+        val result = render(attributes, contentState)
+
+        result.title shouldBeEqualTo "Delivery for Alex"
+        result.body shouldBeEqualTo "Out for delivery"
+        result.subText shouldBeEqualTo "Driver: Pat · Order #ORD-42"
+        result.showProgress.shouldBeTrue()
+        result.progress shouldBeEqualTo 2
+        result.progressMax shouldBeEqualTo 4
+        result.segments.size shouldBeEqualTo 4
+        result.countdownUntil shouldBeEqualTo 1700000000000L
+    }
+
+    @Test
+    fun render_givenNoRecipientName_fallsBackToOrderTitle() {
+        val attributes = JSONObject().apply {
+            put("orderId", "ORD-77")
+        }
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Preparing")
+            put("stepCurrent", 1)
+            put("stepTotal", 3)
+        }
+
+        val result = render(attributes, contentState)
+
+        result.title shouldBeEqualTo "Order #ORD-77"
+        result.subText shouldBeEqualTo "Order #ORD-77"
+    }
+
+    @Test
+    fun render_givenNoDriverNoOrderId_subTextIsNull() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "On the way")
+            put("stepTotal", 3)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.subText.shouldBeNull()
+    }
+
+    @Test
+    fun render_givenDriverButNoOrderId_subTextOmitsOrder() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "On the way")
+            put("driverName", "Pat")
+            put("stepTotal", 3)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.subText shouldBeEqualTo "Driver: Pat"
+    }
+
+    @Test
+    fun render_stepCurrentIsClampedIntoRange() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Anywhere")
+            put("stepCurrent", 99)
+            put("stepTotal", 4)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.progress shouldBeEqualTo 4
+    }
+
+    @Test
+    fun render_stepCurrentNegative_isClampedToZero() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Anywhere")
+            put("stepCurrent", -5)
+            put("stepTotal", 4)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.progress shouldBeEqualTo 0
+    }
+
+    @Test
+    fun render_stepTotalMissing_defaultsAtLeastToOne() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Just placed")
+            put("stepCurrent", 0)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.progressMax shouldBeEqualTo 1
+        result.segments.size shouldBeEqualTo 1
+    }
+
+    @Test
+    fun render_stepTotalZero_isFlooredToOne() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Edge case")
+            put("stepCurrent", 0)
+            put("stepTotal", 0)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.progressMax shouldBeEqualTo 1
+        result.segments.size shouldBeEqualTo 1
+    }
+
+    @Test
+    fun render_estimatedArrivalNonPositive_countdownUntilIsNull() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "No eta")
+            put("estimatedArrival", 0L)
+            put("stepTotal", 2)
+        }
+
+        val result = render(contentState = contentState)
+
+        result.countdownUntil.shouldBeNull()
+    }
+
+    // --- Strict-slotting regression guards ---
+
+    @Test
+    fun render_orderIdInContentState_isIgnored() {
+        // Mis-slotted `orderId` must NOT be picked up from content_state.
+        // This is what locks the strict-slotting decision against future regressions.
+        val attributes = JSONObject()
+        val contentState = JSONObject().apply {
+            put("orderId", "MISPLACED")
+            put("statusMessage", "no order")
+            put("stepTotal", 2)
+        }
+
+        val result = render(attributes, contentState)
+
+        result.title shouldBeEqualTo "Order #"
+        // SubText should not contain the misplaced order id.
+        (result.subText ?: "").shouldContain("").also {
+            (result.subText?.contains("MISPLACED") == true).shouldBeFalse()
+        }
+    }
+
+    @Test
+    fun render_statusMessageInAttributes_isIgnored() {
+        // statusMessage belongs in content_state — putting it in attributes leaves body empty.
+        val attributes = JSONObject().apply {
+            put("orderId", "X")
+            put("statusMessage", "MISPLACED MESSAGE")
+        }
+        val contentState = JSONObject().apply {
+            put("stepTotal", 2)
+        }
+
+        val result = render(attributes, contentState)
+
+        result.body shouldBeEqualTo ""
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt
new file mode 100644
index 000000000..a8c66370d
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt
@@ -0,0 +1,180 @@
+package io.customer.messagingpush.livenotification.template
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeFalse
+import org.amshove.kluent.shouldBeTrue
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Tests for [FlightStatusTemplate].
+ *
+ * Exercises:
+ * - basic title/body/subText composition with origin / destination codes;
+ * - the delay-red branch — `delayMinutes > 0` flips the accent and suffixes the body;
+ * - countdown target switching: `progressFraction` present ⇒ estimatedArrival,
+ *   absent ⇒ scheduledDeparture;
+ * - strict slotting — `flightNumber` in `content_state` is ignored.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class FlightStatusTemplateTest : IntegrationTest() {
+
+    private val delayRed = -0x33ccd0 // #CC3330
+
+    private fun render(
+        attributes: JSONObject = JSONObject(),
+        contentState: JSONObject = JSONObject()
+    ): TemplateRenderResult = FlightStatusTemplate.render(
+        context = contextMock,
+        attributes = attributes,
+        contentState = contentState,
+        branding = null,
+        smallIcon = 0,
+        fallbackTintColor = null
+    )
+
+    private fun baseAttributes() = JSONObject().apply {
+        put("flightNumber", "AA1234")
+        put("origin", JSONObject().put("code", "JFK").put("city", "New York"))
+        put("destination", JSONObject().put("code", "LAX").put("city", "Los Angeles"))
+    }
+
+    @Test
+    fun render_happyPath_composesTitleAndSubText() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "On time")
+            put("gate", "B12")
+            put("terminal", "4")
+            put("scheduledDeparture", 1700000000000L)
+            put("estimatedArrival", 1700100000000L)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.title shouldBeEqualTo "AA1234 · JFK → LAX"
+        result.subText shouldBeEqualTo "Gate B12 · Terminal 4"
+        result.body shouldBeEqualTo "On time"
+    }
+
+    @Test
+    fun render_missingGateAndTerminal_fallsBackToTBA() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Pre-departure")
+            put("scheduledDeparture", 1700000000000L)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.subText shouldBeEqualTo "Gate TBA · Terminal TBA"
+    }
+
+    // --- Delay-red decision branch ---
+
+    @Test
+    fun render_delayMinutesPositive_setsRedAccentAndAppendsBody() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Boarding")
+            put("delayMinutes", 25)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.accentColor shouldBeEqualTo delayRed
+        result.body shouldBeEqualTo "Boarding · Delayed 25 min"
+    }
+
+    @Test
+    fun render_delayMinutesZero_doesNotForceRed() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "On time")
+            put("delayMinutes", 0)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        (result.accentColor == delayRed).shouldBeFalse()
+        result.body shouldBeEqualTo "On time"
+    }
+
+    // --- Progress / countdown switching ---
+
+    @Test
+    fun render_progressFractionPresent_targetsEstimatedArrival() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "In flight")
+            put("scheduledDeparture", 1700000000000L)
+            put("estimatedArrival", 1700100000000L)
+            put("progressFraction", 0.5)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.showProgress.shouldBeTrue()
+        result.progress shouldBeEqualTo 50
+        result.progressMax shouldBeEqualTo 100
+        result.countdownUntil shouldBeEqualTo 1700100000000L
+    }
+
+    @Test
+    fun render_progressFractionAbsent_targetsScheduledDeparture() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "Pre-departure")
+            put("scheduledDeparture", 1700000000000L)
+            put("estimatedArrival", 1700100000000L)
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.showProgress.shouldBeFalse()
+        result.countdownUntil shouldBeEqualTo 1700000000000L
+    }
+
+    @Test
+    fun render_progressFractionOutsideZeroOne_isCoerced() {
+        val contentState = JSONObject().apply {
+            put("statusMessage", "In flight")
+            put("estimatedArrival", 1700100000000L)
+            put("progressFraction", 2.5) // out of range; spec coerces to [0,1]
+        }
+
+        val result = render(baseAttributes(), contentState)
+
+        result.progress shouldBeEqualTo 100
+    }
+
+    // --- Strict-slotting regression guard ---
+
+    @Test
+    fun render_flightNumberInContentState_isIgnored() {
+        val attributes = JSONObject().apply {
+            put("origin", JSONObject().put("code", "JFK"))
+            put("destination", JSONObject().put("code", "LAX"))
+        }
+        val contentState = JSONObject().apply {
+            put("flightNumber", "MISPLACED")
+            put("statusMessage", "x")
+        }
+
+        val result = render(attributes, contentState)
+
+        result.title shouldBeEqualTo " · JFK → LAX" // flightNumber empty, prefix space remains
+    }
+
+    @Test
+    fun render_delayMinutesInAttributes_isIgnored() {
+        val attributes = baseAttributes().apply {
+            put("delayMinutes", 25) // wrong slot
+        }
+        val contentState = JSONObject().apply {
+            put("statusMessage", "x")
+        }
+
+        val result = render(attributes, contentState)
+
+        (result.accentColor == delayRed).shouldBeFalse()
+        result.body shouldBeEqualTo "x"
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt
new file mode 100644
index 000000000..9f180b044
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt
@@ -0,0 +1,151 @@
+package io.customer.messagingpush.livenotification.template
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Tests for [LiveScoreTemplate].
+ *
+ * Exercises the body composition fallback chain:
+ * `statusMessage` overrides ⇒ `period · clock` ⇒ bare `period`.
+ *
+ * Also locks the strict-slotting decision — `homeScore` in `attributes` is ignored.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class LiveScoreTemplateTest : IntegrationTest() {
+
+    private fun render(
+        attributes: JSONObject = JSONObject(),
+        contentState: JSONObject = JSONObject()
+    ): TemplateRenderResult = LiveScoreTemplate.render(
+        context = contextMock,
+        attributes = attributes,
+        contentState = contentState,
+        branding = null,
+        smallIcon = 0,
+        fallbackTintColor = null
+    )
+
+    private fun teamsAttributes() = JSONObject().apply {
+        put("homeTeam", JSONObject().put("name", "Lakers"))
+        put("awayTeam", JSONObject().put("name", "Celtics"))
+        put("sport", "basketball")
+    }
+
+    @Test
+    fun render_givenScoresAndClock_composesTitleAndPeriodClockBody() {
+        val contentState = JSONObject().apply {
+            put("homeScore", 14)
+            put("awayScore", 7)
+            put("period", "2nd Quarter")
+            put("clock", "5:30")
+        }
+
+        val result = render(teamsAttributes(), contentState)
+
+        result.title shouldBeEqualTo "Lakers 14 - 7 Celtics"
+        result.body shouldBeEqualTo "2nd Quarter · 5:30"
+    }
+
+    @Test
+    fun render_givenStatusMessage_overridesBody() {
+        val contentState = JSONObject().apply {
+            put("homeScore", 0)
+            put("awayScore", 0)
+            put("period", "Halftime")
+            put("clock", "0:00")
+            put("statusMessage", "Half time show")
+        }
+
+        val result = render(teamsAttributes(), contentState)
+
+        result.body shouldBeEqualTo "Half time show"
+    }
+
+    @Test
+    fun render_clockAbsent_fallsBackToBarePeriod() {
+        val contentState = JSONObject().apply {
+            put("homeScore", 28)
+            put("awayScore", 24)
+            put("period", "FT")
+        }
+
+        val result = render(teamsAttributes(), contentState)
+
+        result.body shouldBeEqualTo "FT"
+    }
+
+    @Test
+    fun render_emptyClockString_isTreatedAsAbsent() {
+        // Existing template logic treats empty-string clock as "no clock" (takeIf isNotEmpty).
+        val contentState = JSONObject().apply {
+            put("homeScore", 1)
+            put("awayScore", 1)
+            put("period", "1st")
+            put("clock", "")
+        }
+
+        val result = render(teamsAttributes(), contentState)
+
+        result.body shouldBeEqualTo "1st"
+    }
+
+    @Test
+    fun render_emptyTeamNames_defaultsToEmptyStrings() {
+        val attributes = JSONObject().apply {
+            put("homeTeam", JSONObject())
+            put("awayTeam", JSONObject())
+        }
+        val contentState = JSONObject().apply {
+            put("homeScore", 3)
+            put("awayScore", 0)
+            put("period", "1st")
+        }
+
+        val result = render(attributes, contentState)
+
+        result.title shouldBeEqualTo " 3 - 0 "
+    }
+
+    // --- Strict-slotting regression guards ---
+
+    @Test
+    fun render_homeScoreInAttributes_isIgnored() {
+        val attributes = teamsAttributes().apply {
+            put("homeScore", 99) // wrong slot
+        }
+        val contentState = JSONObject().apply {
+            put("awayScore", 7)
+            put("period", "1st")
+        }
+
+        val result = render(attributes, contentState)
+
+        // homeScore defaults to 0 in content_state, because the misplaced value must be ignored.
+        result.title shouldBeEqualTo "Lakers 0 - 7 Celtics"
+    }
+
+    @Test
+    fun render_leagueLogoKeyInContentState_isIgnored() {
+        // leagueLogoKey belongs in `attributes` per the spec. Misplaced should not resolve.
+        val attributes = teamsAttributes()
+        val contentState = JSONObject().apply {
+            put("homeScore", 0)
+            put("awayScore", 0)
+            put("period", "1st")
+            put("leagueLogoKey", "league_nba")
+        }
+
+        val result = render(attributes, contentState)
+
+        // largeIcon should be null because the misplaced key was not consulted.
+        // (No host-app drawable was registered for "league_nba" anyway, but the contract
+        // we lock here is "don't even attempt to resolve from content_state".)
+        // We can't observe `attempted` directly; we can observe the slot still produces null.
+        result.largeIcon shouldBeEqualTo null
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateAssetsTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateAssetsTest.kt
new file mode 100644
index 000000000..569eea04d
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateAssetsTest.kt
@@ -0,0 +1,119 @@
+package io.customer.messagingpush.livenotification.template
+
+import android.content.res.Resources
+import io.customer.commontest.config.TestConfig
+import io.customer.commontest.config.testConfigurationDefault
+import io.customer.commontest.extensions.assertCalledNever
+import io.customer.commontest.extensions.assertCalledOnce
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import io.customer.sdk.core.util.Logger
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import org.amshove.kluent.shouldBeNull
+import org.amshove.kluent.shouldContain
+import org.amshove.kluent.shouldNotBeNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Tests for [TemplateAssets].
+ *
+ * The host app's drawable namespace isn't reachable from a unit-test runtime,
+ * so these tests exercise the boundary behavior every template depends on:
+ * - null / blank keys return `null` without logging warnings;
+ * - non-resolvable keys return `null` and surface a debug log so developers
+ *   can diagnose missing assets without crashing the notification.
+ *
+ * We intentionally do not assert kebab-to-underscore normalization on a real
+ * resource lookup because the test runtime doesn't ship the host app's
+ * drawables; the normalization is exercised by hand-mocking the resource lookup
+ * in `resolveDrawable_kebabCaseKey_isNormalizedToUnderscores`.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class TemplateAssetsTest : IntegrationTest() {
+
+    private val mockLogger: Logger = mockk(relaxed = true)
+
+    override fun setup(testConfig: TestConfig) {
+        super.setup(
+            testConfigurationDefault {
+                diGraph {
+                    sdk {
+                        overrideDependency<Logger>(mockLogger)
+                    }
+                }
+            }
+        )
+    }
+
+    @Test
+    fun resolveDrawable_nullKey_returnsNullWithoutLogging() {
+        val result = TemplateAssets.resolveDrawable(contextMock, null)
+
+        result.shouldBeNull()
+        assertCalledNever { mockLogger.debug(any(), any()) }
+    }
+
+    @Test
+    fun resolveDrawable_blankKey_returnsNullWithoutLogging() {
+        val result = TemplateAssets.resolveDrawable(contextMock, "   ")
+
+        result.shouldBeNull()
+        assertCalledNever { mockLogger.debug(any(), any()) }
+    }
+
+    @Test
+    fun resolveDrawable_emptyKey_returnsNullWithoutLogging() {
+        val result = TemplateAssets.resolveDrawable(contextMock, "")
+
+        result.shouldBeNull()
+        assertCalledNever { mockLogger.debug(any(), any()) }
+    }
+
+    @Test
+    fun resolveDrawable_unresolvedKey_returnsNullAndLogsWarning() {
+        val message = slot<String>()
+        every { mockLogger.debug(capture(message), any()) } returns Unit
+
+        val result = TemplateAssets.resolveDrawable(contextMock, "no_such_drawable_in_test_app")
+
+        result.shouldBeNull()
+        assertCalledOnce { mockLogger.debug(any(), any()) }
+        message.captured shouldContain "did not resolve to a drawable"
+    }
+
+    @Test
+    fun resolveDrawable_kebabCaseKey_isNormalizedToUnderscores() {
+        // We can't actually resolve a host drawable from a unit-test runtime, so we
+        // hand-mock the underlying resources lookup and assert it received the
+        // normalized name. This is what locks the kebab-to-underscore rule.
+        val mockResources = mockk<Resources>()
+        // Underscored form must be queried; if the SDK forwards the kebab form, this
+        // expectation fails because no `every` was set up for it.
+        every {
+            mockResources.getIdentifier("delivery_warehouse", "drawable", any())
+        } returns 12345
+
+        every { contextMock.resources } returns mockResources
+
+        val result = TemplateAssets.resolveDrawable(contextMock, "delivery-warehouse")
+
+        result.shouldNotBeNull()
+    }
+
+    @Test
+    fun resolveBitmap_nullKey_returnsNull() {
+        val result = TemplateAssets.resolveBitmap(contextMock, null)
+
+        result.shouldBeNull()
+    }
+
+    @Test
+    fun resolveBitmap_unresolvedKey_returnsNull() {
+        val result = TemplateAssets.resolveBitmap(contextMock, "no_such_drawable_in_test_app")
+
+        result.shouldBeNull()
+    }
+}

From 938b6235da0a9b7b9ea0e54e5151fdca987f38df Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Thu, 11 Jun 2026 14:27:18 +0400
Subject: [PATCH 07/10] chore: align live notifications with iOS + address
 #676/#690 review feedback (#722)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../messagingpush/LiveNotificationHandler.kt  |  94 +++++++---
 .../template/AuctionBidTemplate.kt            |  27 ++-
 .../template/CountdownTimerTemplate.kt        |  63 ++-----
 .../template/DeliveryTrackingTemplate.kt      |  27 ++-
 .../template/FlightStatusTemplate.kt          |  29 ++-
 .../template/JsonExtensions.kt                |  16 ++
 .../template/LiveNotificationTemplate.kt      |  11 +-
 .../template/LiveScoreTemplate.kt             |  27 ++-
 .../template/TemplateAssets.kt                |   3 +-
 .../template/TemplateRegistry.kt              |  10 +-
 .../LiveNotificationHandlerTest.kt            | 171 ++++++++----------
 .../template/AuctionBidTemplateTest.kt        |  40 +---
 .../template/CountdownTimerTemplateTest.kt    |  36 +---
 .../template/DeliveryTrackingTemplateTest.kt  |  52 +-----
 .../template/FlightStatusTemplateTest.kt      |  41 +----
 .../template/LiveScoreTemplateTest.kt         |  43 +----
 .../template/TemplateTestData.kt              |  20 ++
 .../LiveNotificationDemoActivity.java         |  40 ++--
 18 files changed, 304 insertions(+), 446 deletions(-)
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/JsonExtensions.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateTestData.kt

diff --git a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
index b590a315a..a4523ea09 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
@@ -7,18 +7,18 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import io.customer.messagingpush.activity.NotificationClickReceiverActivity
 import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
 import io.customer.messagingpush.di.pushModuleConfig
-import io.customer.messagingpush.extensions.getDrawableByName
 import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import io.customer.messagingpush.livenotification.template.TemplateAssets
 import io.customer.messagingpush.livenotification.template.TemplateRegistry
+import io.customer.messagingpush.util.PushTrackingUtil
 import io.customer.sdk.core.di.SDKComponent
+import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
@@ -28,10 +28,11 @@ import org.json.JSONObject
  * Live notifications are ongoing notifications that can be updated in-place
  * (the Android counterpart of iOS Live Activities). Each push declares an
  * `activity_type` (one of the closed set in [TemplateRegistry], prefixed with
- * `io.customer.live.`) plus two JSON objects: `attributes` for static fields
- * and `content_state` for dynamic fields. Pushes share a stable
- * [ACTIVITY_ID_KEY] so successive updates replace the previous notification
- * rather than creating new ones.
+ * `io.customer.liveactivities.`). Unlike iOS, Android does not split static
+ * `attributes` from dynamic `content-state`: all template fields arrive
+ * flattened at the envelope top level. Pushes share a stable [ACTIVITY_ID_KEY]
+ * so successive updates replace the previous notification rather than creating
+ * new ones.
  */
 internal class LiveNotificationHandler(
     private val bundle: Bundle
@@ -41,12 +42,30 @@ internal class LiveNotificationHandler(
         const val ACTIVITY_ID_KEY = "activity_id"
         const val EVENT_KEY = "event"
         const val ACTIVITY_TYPE_KEY = "activity_type"
-        const val ATTRIBUTES_KEY = "attributes"
-        const val CONTENT_STATE_KEY = "content_state"
+        const val TIMESTAMP_KEY = "timestamp"
+        const val DISMISSAL_DATE_KEY = "dismissal_date"
 
         private const val EVENT_END = "end"
 
-        private const val DEFAULT_DISMISS_DELAY_MS = 3000L
+        /**
+         * Live-notification envelope keys that are never template fields.
+         * Everything else in the bundle is flattened into the template `data`
+         * object.
+         *
+         * Note: standard-push keys (`title`, `body`, `image`, `link`, …) are
+         * intentionally NOT reserved here — they are not part of the live
+         * envelope, and reserving them would shadow legitimate template fields
+         * of the same name (e.g. CountdownTimer's `title`).
+         */
+        private val RESERVED_KEYS = setOf(
+            ACTIVITY_ID_KEY,
+            EVENT_KEY,
+            ACTIVITY_TYPE_KEY,
+            TIMESTAMP_KEY,
+            DISMISSAL_DATE_KEY,
+            PushTrackingUtil.DELIVERY_ID_KEY,
+            PushTrackingUtil.DELIVERY_TOKEN_KEY
+        )
     }
 
     fun handle(
@@ -69,6 +88,13 @@ internal class LiveNotificationHandler(
         }
 
         val activityId = bundle.getString(ACTIVITY_ID_KEY) ?: return
+        val event = bundle.getString(EVENT_KEY)
+        if (event == null) {
+            SDKComponent.logger.error(
+                "Live notification push for activity '$activityId' is missing '$EVENT_KEY'; dropping."
+            )
+            return
+        }
         val activityType = bundle.getString(ACTIVITY_TYPE_KEY)
         val template = TemplateRegistry.find(activityType)
         if (template == null) {
@@ -78,22 +104,19 @@ internal class LiveNotificationHandler(
             return
         }
 
-        val attributes = parseJson(bundle.getString(ATTRIBUTES_KEY))
-        val contentState = parseJson(bundle.getString(CONTENT_STATE_KEY))
+        val data = extractData(bundle)
         val branding = SDKComponent.pushModuleConfig.liveNotificationBranding
         val effectiveSmallIcon = resolveSmallIcon(context, branding, smallIcon)
 
         val result = template.render(
             context = context,
-            attributes = attributes,
-            contentState = contentState,
+            data = data,
             branding = branding,
             smallIcon = effectiveSmallIcon,
             fallbackTintColor = tintColor
         )
 
         val notifId = activityId.hashCode() and 0x7FFFFFFF
-        val event = bundle.getString(EVENT_KEY) ?: "update"
 
         if (result.cancelImmediately) {
             notificationManager.cancel(activityId, notifId)
@@ -160,19 +183,39 @@ internal class LiveNotificationHandler(
         notificationManager.notify(activityId, notifId, notification)
 
         if (event == EVENT_END) {
-            Handler(Looper.getMainLooper()).postDelayed({
-                notificationManager.cancel(activityId, notifId)
-            }, DEFAULT_DISMISS_DELAY_MS)
+            // Without a dismissal_date the activity is removed immediately.
+            // Scheduled dismissal via dismissal_date is added with lifecycle reporting.
+            notificationManager.cancel(activityId, notifId)
         }
     }
 
-    private fun parseJson(raw: String?): JSONObject {
-        if (raw.isNullOrEmpty()) return JSONObject()
+    /**
+     * Collects the flattened template fields from the FCM envelope: every
+     * top-level bundle key that is not a [RESERVED_KEYS] envelope key. String
+     * values that look like JSON objects/arrays (e.g. `origin`, `homeTeam`) are
+     * parsed so templates can read them as nested structures; scalar strings
+     * are kept verbatim and coerced on read by `JSONObject.optInt`/`optLong`/etc.
+     */
+    private fun extractData(bundle: Bundle): JSONObject {
+        val data = JSONObject()
+        for (key in bundle.keySet()) {
+            if (key in RESERVED_KEYS) continue
+            val raw = bundle.getString(key) ?: continue
+            data.put(key, coerceJsonValue(raw))
+        }
+        return data
+    }
+
+    private fun coerceJsonValue(raw: String): Any {
+        val trimmed = raw.trim()
         return try {
-            JSONObject(raw)
+            when {
+                trimmed.startsWith("{") -> JSONObject(trimmed)
+                trimmed.startsWith("[") -> JSONArray(trimmed)
+                else -> raw
+            }
         } catch (e: JSONException) {
-            SDKComponent.logger.error("Failed to parse live notification JSON: ${e.message}")
-            JSONObject()
+            raw
         }
     }
 
@@ -182,9 +225,8 @@ internal class LiveNotificationHandler(
         branding: LiveNotificationBranding?,
         fallback: Int
     ): Int {
-        val key = branding?.logoDrawableName?.takeIf { it.isNotEmpty() } ?: return fallback
-        val normalized = key.replace('-', '_')
-        return context.getDrawableByName(normalized) ?: fallback
+        // Reuses TemplateAssets' kebab→snake normalization + drawable lookup.
+        return TemplateAssets.resolveDrawable(context, branding?.logoDrawableName) ?: fallback
     }
 
     private fun createIntentForNotificationClick(
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
index abb92541d..d8ffab030 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
@@ -5,10 +5,10 @@ import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import org.json.JSONObject
 
 /**
- * `auction_bid` template — current bid + winning/outbid state.
+ * `auctionbid` template — current bid + winning/outbid state.
  *
- * Static: itemTitle (req), itemImageKey (opt), currencySymbol (default `$`).
- * Dynamic: currentBid (req, preformatted string), bidCount (req, int),
+ * Fields: itemTitle (req), itemImageKey (opt), currencySymbol (default `$`),
+ * currentBid (req, preformatted string), bidCount (req, int),
  * endTime (req, epoch ms), statusMessage (req), isUserHighBidder (req, bool),
  * userBidAmount (opt, preformatted string).
  *
@@ -24,21 +24,20 @@ internal object AuctionBidTemplate : LiveNotificationTemplate {
 
     override fun render(
         context: Context,
-        attributes: JSONObject,
-        contentState: JSONObject,
+        data: JSONObject,
         branding: LiveNotificationBranding?,
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val itemTitle = attributes.optString("itemTitle")
-        val itemImageKey = attributes.optString("itemImageKey").takeIf { it.isNotEmpty() }
-        val currencySymbol = attributes.optString("currencySymbol").takeIf { it.isNotEmpty() } ?: "$"
-        val currentBid = contentState.optString("currentBid")
-        val bidCount = contentState.optInt("bidCount", 0)
-        val endTime = contentState.optLong("endTime").takeIf { it > 0 }
-        val statusMessage = contentState.optString("statusMessage")
-        val isUserHighBidder = contentState.optBoolean("isUserHighBidder", false)
-        val userBidAmount = contentState.optString("userBidAmount").takeIf { it.isNotEmpty() }
+        val itemTitle = data.optString("itemTitle")
+        val itemImageKey = data.optStringNonEmpty("itemImageKey")
+        val currencySymbol = data.optStringNonEmpty("currencySymbol") ?: "$"
+        val currentBid = data.optString("currentBid")
+        val bidCount = data.optInt("bidCount", 0)
+        val endTime = data.optLong("endTime").takeIf { it > 0 }
+        val statusMessage = data.optString("statusMessage")
+        val isUserHighBidder = data.optBoolean("isUserHighBidder", false)
+        val userBidAmount = data.optStringNonEmpty("userBidAmount")
 
         val body = "$statusMessage · $currencySymbol$currentBid"
         val subText = userBidAmount
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
index 7629c82c8..066422911 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
@@ -5,13 +5,12 @@ import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import org.json.JSONObject
 
 /**
- * `countdown_timer` template — chronometer ticking toward [targetDate].
+ * `countdowntimer` template — chronometer ticking toward [targetDate].
  *
- * Static: title (req), heroImageKey (opt).
- * Dynamic: targetDate (req, epoch ms — extendable across pushes), statusMessage
- * (req, label above timer), expiredMessage (opt). Post-target with no
- * expiredMessage means the activity should hide; SDK signals this via
- * [TemplateRenderResult.cancelImmediately].
+ * Fields: title (req), heroImageKey (opt), targetDate (req, epoch ms —
+ * extendable across pushes), statusMessage (req, label above timer),
+ * expiredMessage (opt). Post-target with no expiredMessage means the activity
+ * should hide; SDK signals this via [TemplateRenderResult.cancelImmediately].
  */
 internal object CountdownTimerTemplate : LiveNotificationTemplate {
 
@@ -19,53 +18,28 @@ internal object CountdownTimerTemplate : LiveNotificationTemplate {
 
     override fun render(
         context: Context,
-        attributes: JSONObject,
-        contentState: JSONObject,
+        data: JSONObject,
         branding: LiveNotificationBranding?,
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val title = attributes.optString("title")
-        val heroImageKey = attributes.optString("heroImageKey").takeIf { it.isNotEmpty() }
-        val targetDate = contentState.optLong("targetDate").takeIf { it > 0 }
-        val statusMessage = contentState.optString("statusMessage")
-        val expiredMessage = contentState.optString("expiredMessage").takeIf { it.isNotEmpty() }
+        val title = data.optString("title")
+        val heroImageKey = data.optStringNonEmpty("heroImageKey")
+        val targetDate = data.optLong("targetDate").takeIf { it > 0 }
+        val statusMessage = data.optString("statusMessage")
+        val expiredMessage = data.optStringNonEmpty("expiredMessage")
 
         val now = System.currentTimeMillis()
         val isPostTarget = targetDate != null && now >= targetDate
-
-        if (isPostTarget && expiredMessage == null) {
-            // Server pushed a post-target state with no message: hide the activity.
-            return TemplateRenderResult(
-                title = title,
-                body = "",
-                subText = null,
-                largeIcon = null,
-                accentColor = null,
-                colorized = false,
-                showProgress = false,
-                progress = 0,
-                progressMax = 0,
-                segments = emptyList(),
-                points = emptyList(),
-                startIconRes = null,
-                endIconRes = null,
-                trackerIconRes = null,
-                countdownUntil = null,
-                deepLink = null,
-                cancelImmediately = true
-            )
-        }
-
-        val body = if (isPostTarget) expiredMessage.orEmpty() else statusMessage
-        val countdownUntil = if (isPostTarget) null else targetDate
+        // Server pushed a post-target state with no message: hide the activity.
+        val cancelImmediately = isPostTarget && expiredMessage == null
 
         return TemplateRenderResult(
             title = title,
-            body = body,
+            body = if (isPostTarget) expiredMessage.orEmpty() else statusMessage,
             subText = null,
-            largeIcon = TemplateAssets.resolveBitmap(context, heroImageKey),
-            accentColor = branding?.accentColor ?: fallbackTintColor,
+            largeIcon = if (cancelImmediately) null else TemplateAssets.resolveBitmap(context, heroImageKey),
+            accentColor = if (cancelImmediately) null else (branding?.accentColor ?: fallbackTintColor),
             colorized = false,
             showProgress = false,
             progress = 0,
@@ -75,8 +49,9 @@ internal object CountdownTimerTemplate : LiveNotificationTemplate {
             startIconRes = null,
             endIconRes = null,
             trackerIconRes = null,
-            countdownUntil = countdownUntil,
-            deepLink = null
+            countdownUntil = if (isPostTarget) null else targetDate,
+            deepLink = null,
+            cancelImmediately = cancelImmediately
         )
     }
 }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
index 7c2b3905a..11b20f046 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
@@ -5,11 +5,11 @@ import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import org.json.JSONObject
 
 /**
- * `delivery_tracking` template — segmented progress bar over delivery stages.
+ * `deliverytracking` template — segmented progress bar over delivery stages.
  *
- * Static: orderId (req), recipientName (opt).
- * Dynamic: statusMessage (req), statusImageKey (opt), stepCurrent/stepTotal (req),
- * estimatedArrival (opt, epoch ms), driverName (opt).
+ * Fields: orderId (req), recipientName (opt), statusMessage (req),
+ * statusImageKey (opt), stepCurrent/stepTotal (req), estimatedArrival (opt,
+ * epoch ms), driverName (opt).
  */
 internal object DeliveryTrackingTemplate : LiveNotificationTemplate {
 
@@ -17,20 +17,19 @@ internal object DeliveryTrackingTemplate : LiveNotificationTemplate {
 
     override fun render(
         context: Context,
-        attributes: JSONObject,
-        contentState: JSONObject,
+        data: JSONObject,
         branding: LiveNotificationBranding?,
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val orderId = attributes.optString("orderId")
-        val recipientName = attributes.optString("recipientName").takeIf { it.isNotEmpty() }
-        val statusMessage = contentState.optString("statusMessage")
-        val statusImageKey = contentState.optString("statusImageKey").takeIf { it.isNotEmpty() }
-        val stepCurrent = contentState.optInt("stepCurrent", 0)
-        val stepTotal = contentState.optInt("stepTotal", 1).coerceAtLeast(1)
-        val estimatedArrival = contentState.optLong("estimatedArrival").takeIf { it > 0 }
-        val driverName = contentState.optString("driverName").takeIf { it.isNotEmpty() }
+        val orderId = data.optString("orderId")
+        val recipientName = data.optStringNonEmpty("recipientName")
+        val statusMessage = data.optString("statusMessage")
+        val statusImageKey = data.optStringNonEmpty("statusImageKey")
+        val stepCurrent = data.optInt("stepCurrent", 0)
+        val stepTotal = data.optInt("stepTotal", 1).coerceAtLeast(1)
+        val estimatedArrival = data.optLong("estimatedArrival").takeIf { it > 0 }
+        val driverName = data.optStringNonEmpty("driverName")
 
         val title = recipientName?.let { "Delivery for $it" } ?: "Order #$orderId"
         val subText = when {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
index cca6c58b1..d434bf7c7 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
@@ -5,10 +5,10 @@ import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import org.json.JSONObject
 
 /**
- * `flight_status` template — flight progress with optional in-flight progress bar.
+ * `flightstatus` template — flight progress with optional in-flight progress bar.
  *
- * Static: flightNumber, origin{code, city}, destination{code, city}.
- * Dynamic: statusMessage (req), gate (opt), terminal (opt),
+ * Fields: flightNumber, origin{code, city}, destination{code, city},
+ * statusMessage (req), gate (opt), terminal (opt),
  * scheduledDeparture/estimatedArrival (req, epoch ms), progressFraction (opt, 0–1),
  * delayMinutes (opt).
  */
@@ -20,27 +20,26 @@ internal object FlightStatusTemplate : LiveNotificationTemplate {
 
     override fun render(
         context: Context,
-        attributes: JSONObject,
-        contentState: JSONObject,
+        data: JSONObject,
         branding: LiveNotificationBranding?,
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val flightNumber = attributes.optString("flightNumber")
-        val origin = attributes.optJSONObject("origin")
-        val destination = attributes.optJSONObject("destination")
+        val flightNumber = data.optString("flightNumber")
+        val origin = data.optJSONObject("origin")
+        val destination = data.optJSONObject("destination")
         val originCode = origin?.optString("code").orEmpty()
         val destinationCode = destination?.optString("code").orEmpty()
 
-        val statusMessage = contentState.optString("statusMessage")
-        val gate = contentState.optString("gate").takeIf { it.isNotEmpty() }
-        val terminal = contentState.optString("terminal").takeIf { it.isNotEmpty() }
-        val scheduledDeparture = contentState.optLong("scheduledDeparture").takeIf { it > 0 }
-        val estimatedArrival = contentState.optLong("estimatedArrival").takeIf { it > 0 }
+        val statusMessage = data.optString("statusMessage")
+        val gate = data.optStringNonEmpty("gate")
+        val terminal = data.optStringNonEmpty("terminal")
+        val scheduledDeparture = data.optLong("scheduledDeparture").takeIf { it > 0 }
+        val estimatedArrival = data.optLong("estimatedArrival").takeIf { it > 0 }
         val progressFractionRaw =
-            if (contentState.has("progressFraction")) contentState.optDouble("progressFraction") else Double.NaN
+            if (data.has("progressFraction")) data.optDouble("progressFraction") else Double.NaN
         val progressFraction = progressFractionRaw.takeIf { !it.isNaN() }
-        val delayMinutes = contentState.optInt("delayMinutes", 0).takeIf { it > 0 }
+        val delayMinutes = data.optInt("delayMinutes", 0).takeIf { it > 0 }
 
         val title = "$flightNumber · $originCode → $destinationCode"
         val subText = "Gate ${gate ?: "TBA"} · Terminal ${terminal ?: "TBA"}"
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/JsonExtensions.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/JsonExtensions.kt
new file mode 100644
index 000000000..0a57da9f7
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/JsonExtensions.kt
@@ -0,0 +1,16 @@
+package io.customer.messagingpush.livenotification.template
+
+import org.json.JSONObject
+
+/**
+ * Returns the string value for [key], or null when the key is absent, holds an
+ * explicit JSON null, or is empty.
+ *
+ * Prefer this over `optString(key).takeIf { it.isNotEmpty() }`: `optString`
+ * returns the literal string `"null"` for an explicit JSON null, which would
+ * otherwise slip past an `isNotEmpty()` guard and render as visible text.
+ */
+internal fun JSONObject.optStringNonEmpty(key: String): String? {
+    if (isNull(key)) return null
+    return optString(key).takeIf { it.isNotEmpty() }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt
index 472f05b91..c95c0f43d 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationTemplate.kt
@@ -9,14 +9,14 @@ import org.json.JSONObject
 /**
  * Renders a single live-notification template.
  *
- * Each template owns its typed schema (e.g. `delivery_tracking` knows about
+ * Each template owns its typed schema (e.g. `deliverytracking` knows about
  * `orderId`, `stepCurrent`, `statusImageKey`). The handler dispatches to a
  * concrete subtype via [TemplateRegistry.find] using the `activity_type` key
  * from the FCM envelope.
  *
- * Static fields arrive in the `attributes` JSON object; dynamic fields arrive
- * in the `content_state` JSON object. Strict slotting is enforced — each
- * template reads each documented field only from its designated slot.
+ * All template fields arrive flattened in a single [data] object alongside the
+ * envelope keys (unlike iOS, Android does not split static `attributes` from
+ * dynamic `content-state`). Each template reads the fields it documents.
  *
  * Sealed and `internal` — the v1 closed set of templates is the only path.
  * Adding a template means adding a subtype to this hierarchy and an entry to
@@ -27,8 +27,7 @@ internal sealed interface LiveNotificationTemplate {
 
     fun render(
         context: Context,
-        attributes: JSONObject,
-        contentState: JSONObject,
+        data: JSONObject,
         branding: LiveNotificationBranding?,
         @DrawableRes smallIcon: Int,
         @ColorInt fallbackTintColor: Int?
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
index 91fb58f9d..0a896510c 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
@@ -5,11 +5,11 @@ import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import org.json.JSONObject
 
 /**
- * `live_score` template — text-only live update for sports scores.
+ * `livescore` template — text-only live update for sports scores.
  *
- * Static: homeTeam{name, logoKey?}, awayTeam{name, logoKey?}, sport (ignored —
- * Android can't change layout per sport without custom views), leagueLogoKey (opt).
- * Dynamic: homeScore/awayScore (int), period (req), clock (opt),
+ * Fields: homeTeam{name, logoKey?}, awayTeam{name, logoKey?}, sport (ignored —
+ * Android can't change layout per sport without custom views), leagueLogoKey (opt),
+ * homeScore/awayScore (int), period (req), clock (opt),
  * statusMessage (opt — overrides body for special situations).
  *
  * Limitation: Android exposes a single large-icon slot; we use [leagueLogoKey].
@@ -21,22 +21,21 @@ internal object LiveScoreTemplate : LiveNotificationTemplate {
 
     override fun render(
         context: Context,
-        attributes: JSONObject,
-        contentState: JSONObject,
+        data: JSONObject,
         branding: LiveNotificationBranding?,
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val homeTeam = attributes.optJSONObject("homeTeam")
-        val awayTeam = attributes.optJSONObject("awayTeam")
+        val homeTeam = data.optJSONObject("homeTeam")
+        val awayTeam = data.optJSONObject("awayTeam")
         val homeName = homeTeam?.optString("name").orEmpty()
         val awayName = awayTeam?.optString("name").orEmpty()
-        val homeScore = contentState.optInt("homeScore", 0)
-        val awayScore = contentState.optInt("awayScore", 0)
-        val period = contentState.optString("period")
-        val clock = contentState.optString("clock").takeIf { it.isNotEmpty() }
-        val statusMessage = contentState.optString("statusMessage").takeIf { it.isNotEmpty() }
-        val leagueLogoKey = attributes.optString("leagueLogoKey").takeIf { it.isNotEmpty() }
+        val homeScore = data.optInt("homeScore", 0)
+        val awayScore = data.optInt("awayScore", 0)
+        val period = data.optString("period")
+        val clock = data.optStringNonEmpty("clock")
+        val statusMessage = data.optStringNonEmpty("statusMessage")
+        val leagueLogoKey = data.optStringNonEmpty("leagueLogoKey")
 
         val title = "$homeName $homeScore - $awayScore $awayName"
         val body = statusMessage
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt
index 4863e76d3..17c43b0cf 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateAssets.kt
@@ -6,6 +6,7 @@ import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.createBitmap
 import io.customer.messagingpush.extensions.getDrawableByName
 import io.customer.sdk.core.di.SDKComponent
 
@@ -49,7 +50,7 @@ internal object TemplateAssets {
         val width = drawable.intrinsicWidth.takeIf { it > 0 } ?: 1
         val height = drawable.intrinsicHeight.takeIf { it > 0 } ?: 1
         return try {
-            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            val bitmap = createBitmap(width, height)
             val canvas = Canvas(bitmap)
             drawable.setBounds(0, 0, canvas.width, canvas.height)
             drawable.draw(canvas)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
index 394a30b14..7d0d278e0 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
@@ -2,11 +2,11 @@ package io.customer.messagingpush.livenotification.template
 
 internal object TemplateRegistry {
 
-    const val DELIVERY_TRACKING = "io.customer.live.delivery_tracking"
-    const val FLIGHT_STATUS = "io.customer.live.flight_status"
-    const val LIVE_SCORE = "io.customer.live.live_score"
-    const val COUNTDOWN_TIMER = "io.customer.live.countdown_timer"
-    const val AUCTION_BID = "io.customer.live.auction_bid"
+    const val DELIVERY_TRACKING = "io.customer.liveactivities.deliverytracking"
+    const val FLIGHT_STATUS = "io.customer.liveactivities.flightstatus"
+    const val LIVE_SCORE = "io.customer.liveactivities.livescore"
+    const val COUNTDOWN_TIMER = "io.customer.liveactivities.countdowntimer"
+    const val AUCTION_BID = "io.customer.liveactivities.auctionbid"
 
     fun find(name: String?): LiveNotificationTemplate? = when (name) {
         DELIVERY_TRACKING -> DeliveryTrackingTemplate
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
index 4b49f70e4..7af358f3e 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
@@ -6,23 +6,26 @@ import android.os.Bundle
 import io.customer.commontest.extensions.assertCalledNever
 import io.customer.messagingpush.livenotification.template.TemplateRegistry
 import io.customer.messagingpush.testutils.core.IntegrationTest
+import io.mockk.every
 import io.mockk.mockk
+import io.mockk.slot
 import io.mockk.verify
+import org.amshove.kluent.shouldBeEqualTo
+import org.json.JSONObject
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.Shadows
-import org.robolectric.shadows.ShadowLooper
 
 /**
  * Tests for [LiveNotificationHandler] focused on envelope parsing and dispatch:
  *
- * - top-level wire keys (`activity_id`, `event`, `activity_type`, `attributes`,
- *   `content_state`) are read from the [Bundle];
- * - `attributes` and `content_state` are decoded into independent JSONObjects;
- * - unknown / missing `activity_type` and `activity_id` are dropped without
- *   posting a notification;
- * - `event = "end"` schedules a delayed cancel.
+ * - top-level wire keys (`activity_id`, `event`, `activity_type`, `timestamp`,
+ *   `dismissal_date`) are read from the [Bundle];
+ * - template fields arrive flattened at the envelope top level (no
+ *   `attributes` / `content_state` split);
+ * - missing `activity_id`, `event`, or unknown `activity_type` are dropped
+ *   without posting a notification;
+ * - `event = "end"` cancels the notification immediately.
  *
  * The actual rendered notification is opaque to these tests — that's covered by
  * the per-template render tests. Here we only assert the dispatch contract.
@@ -37,15 +40,14 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
         activityId: String? = "live-act-1",
         event: String? = "start",
         activityType: String? = TemplateRegistry.DELIVERY_TRACKING,
-        attributesJson: String? = "{}",
-        contentStateJson: String? = "{}"
+        data: JSONObject = JSONObject()
     ): Bundle {
         val bundle = Bundle()
         if (activityId != null) bundle.putString(LiveNotificationHandler.ACTIVITY_ID_KEY, activityId)
         if (event != null) bundle.putString(LiveNotificationHandler.EVENT_KEY, event)
         if (activityType != null) bundle.putString(LiveNotificationHandler.ACTIVITY_TYPE_KEY, activityType)
-        if (attributesJson != null) bundle.putString(LiveNotificationHandler.ATTRIBUTES_KEY, attributesJson)
-        if (contentStateJson != null) bundle.putString(LiveNotificationHandler.CONTENT_STATE_KEY, contentStateJson)
+        // Template fields ride flattened at the top level, as the backend delivers them.
+        for (key in data.keys()) bundle.putString(key, data.get(key).toString())
         return bundle
     }
 
@@ -69,11 +71,11 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
     fun envelopeKeys_areTheCrossPlatformSpecKeys() {
         // Lock the wire-format constants so any future rename surfaces here.
         // Failure to update both the SDK and CIO backend would silently break live notifications.
-        assert(LiveNotificationHandler.ACTIVITY_ID_KEY == "activity_id")
-        assert(LiveNotificationHandler.EVENT_KEY == "event")
-        assert(LiveNotificationHandler.ACTIVITY_TYPE_KEY == "activity_type")
-        assert(LiveNotificationHandler.ATTRIBUTES_KEY == "attributes")
-        assert(LiveNotificationHandler.CONTENT_STATE_KEY == "content_state")
+        LiveNotificationHandler.ACTIVITY_ID_KEY shouldBeEqualTo "activity_id"
+        LiveNotificationHandler.EVENT_KEY shouldBeEqualTo "event"
+        LiveNotificationHandler.ACTIVITY_TYPE_KEY shouldBeEqualTo "activity_type"
+        LiveNotificationHandler.TIMESTAMP_KEY shouldBeEqualTo "timestamp"
+        LiveNotificationHandler.DISMISSAL_DATE_KEY shouldBeEqualTo "dismissal_date"
     }
 
     // --- Happy-path dispatch ---
@@ -88,12 +90,7 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
             TemplateRegistry.AUCTION_BID
         )
         for (activityType in templates) {
-            val bundle = newBundle(
-                activityType = activityType,
-                attributesJson = "{}",
-                contentStateJson = "{}"
-            )
-            invoke(handlerFor(bundle))
+            invoke(handlerFor(newBundle(activityType = activityType)))
         }
 
         verify(exactly = templates.size) {
@@ -105,11 +102,14 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
     fun handle_postsNotificationKeyedByActivityIdHash() {
         val activityId = "live-activity-id-xyz"
         val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
-        val bundle = newBundle(
-            activityId = activityId,
-            attributesJson = """{"orderId":"A-1","recipientName":"User"}""",
-            contentStateJson = """{"statusMessage":"Out for delivery","stepCurrent":2,"stepTotal":4}"""
-        )
+        val data = JSONObject().apply {
+            put("orderId", "A-1")
+            put("recipientName", "User")
+            put("statusMessage", "Out for delivery")
+            put("stepCurrent", 2)
+            put("stepTotal", 4)
+        }
+        val bundle = newBundle(activityId = activityId, data = data)
 
         invoke(handlerFor(bundle))
 
@@ -118,35 +118,47 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
         }
     }
 
-    // --- Missing required fields short-circuit ---
-
     @Test
-    fun handle_givenMissingActivityId_returnsEarlyWithoutNotifying() {
-        val bundle = newBundle(activityId = null)
-
-        invoke(handlerFor(bundle))
-
-        assertCalledNever {
-            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+    fun handle_givenTemplateFieldNamedTitle_isNotStrippedAsReservedKey() {
+        // Regression: "title" is a CountdownTimer template field and must reach the
+        // template, not be treated as the standard-push reserved key and dropped.
+        val posted = slot<Notification>()
+        every { notificationManager.notify(any<String>(), any<Int>(), capture(posted)) } returns Unit
+
+        val data = JSONObject().apply {
+            put("title", "Flash Sale")
+            put("targetDate", System.currentTimeMillis() + 60_000L)
+            put("statusMessage", "Sale starts in")
         }
+        invoke(handlerFor(newBundle(activityType = TemplateRegistry.COUNTDOWN_TIMER, data = data)))
+
+        posted.captured.extras.getCharSequence(Notification.EXTRA_TITLE)?.toString() shouldBeEqualTo "Flash Sale"
     }
 
     @Test
-    fun handle_givenMissingActivityType_dropsAndDoesNotNotify() {
-        val bundle = newBundle(activityType = null)
+    fun handle_givenNestedJsonFieldAsString_parsesAndPosts() {
+        // Nested objects (origin, homeTeam, …) arrive as JSON strings in FCM data;
+        // the handler parses them so templates can read the nested values.
+        val data = JSONObject().apply {
+            put("flightNumber", "AA1")
+            put("origin", JSONObject().put("code", "JFK"))
+            put("destination", JSONObject().put("code", "LAX"))
+            put("statusMessage", "On time")
+        }
+        val bundle = newBundle(activityType = TemplateRegistry.FLIGHT_STATUS, data = data)
 
         invoke(handlerFor(bundle))
 
-        assertCalledNever {
+        verify(exactly = 1) {
             notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
         }
     }
 
-    @Test
-    fun handle_givenUnknownActivityType_dropsAndDoesNotNotify() {
-        val bundle = newBundle(activityType = "io.customer.live.bogus")
+    // --- Missing required fields short-circuit ---
 
-        invoke(handlerFor(bundle))
+    @Test
+    fun handle_givenMissingActivityId_returnsEarlyWithoutNotifying() {
+        invoke(handlerFor(newBundle(activityId = null)))
 
         assertCalledNever {
             notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
@@ -154,102 +166,71 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
     }
 
     @Test
-    fun handle_givenBareTemplateNameWithoutSpecPrefix_dropsAndDoesNotNotify() {
-        // The cross-platform spec requires the `io.customer.live.` prefix.
-        // Bare names like "delivery_tracking" must be rejected to stay aligned with iOS.
-        val bundle = newBundle(activityType = "delivery_tracking")
-
-        invoke(handlerFor(bundle))
+    fun handle_givenMissingEvent_dropsAndDoesNotNotify() {
+        // event is required — there is no implicit "update" default.
+        invoke(handlerFor(newBundle(event = null)))
 
         assertCalledNever {
             notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
         }
     }
 
-    // --- Malformed JSON tolerated ---
-
     @Test
-    fun handle_givenMalformedAttributesJson_stillPostsNotification() {
-        // Lenient parsing — malformed JSON in one slot becomes an empty JSONObject so
-        // the template still attempts to render with defaults rather than dropping the push.
-        val bundle = newBundle(
-            attributesJson = "{this is not json",
-            contentStateJson = "{}"
-        )
-
-        invoke(handlerFor(bundle))
+    fun handle_givenMissingActivityType_dropsAndDoesNotNotify() {
+        invoke(handlerFor(newBundle(activityType = null)))
 
-        verify(exactly = 1) {
+        assertCalledNever {
             notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
         }
     }
 
     @Test
-    fun handle_givenMalformedContentStateJson_stillPostsNotification() {
-        val bundle = newBundle(
-            attributesJson = "{}",
-            contentStateJson = "}not json{"
-        )
-
-        invoke(handlerFor(bundle))
+    fun handle_givenUnknownActivityType_dropsAndDoesNotNotify() {
+        invoke(handlerFor(newBundle(activityType = "io.customer.liveactivities.bogus")))
 
-        verify(exactly = 1) {
+        assertCalledNever {
             notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
         }
     }
 
     @Test
-    fun handle_givenNullAttributesAndContentState_stillPostsNotification() {
-        val bundle = newBundle(
-            attributesJson = null,
-            contentStateJson = null
-        )
-
-        invoke(handlerFor(bundle))
+    fun handle_givenBareTemplateNameWithoutSpecPrefix_dropsAndDoesNotNotify() {
+        // The cross-platform spec requires the `io.customer.liveactivities.` prefix.
+        // Bare names like "deliverytracking" must be rejected to stay aligned with iOS.
+        invoke(handlerFor(newBundle(activityType = "deliverytracking")))
 
-        verify(exactly = 1) {
+        assertCalledNever {
             notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
         }
     }
 
-    // --- End event dismisses after the documented delay ---
+    // --- End event dismisses immediately ---
 
     @Test
-    fun handle_givenEventEnd_schedulesDelayedCancel() {
+    fun handle_givenEventEnd_cancelsImmediately() {
         val activityId = "ending-activity"
         val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
-        val bundle = newBundle(
-            activityId = activityId,
-            event = "end"
-        )
+        val bundle = newBundle(activityId = activityId, event = "end")
 
         invoke(handlerFor(bundle))
 
-        // Notification was posted immediately and a cancel was queued on the main looper.
+        // Final state is posted, then removed immediately (dismissal_date scheduling
+        // arrives with the lifecycle-reporting work).
         verify(exactly = 1) {
             notificationManager.notify(activityId, expectedNotifId, any<Notification>())
         }
-        assertCalledNever {
-            notificationManager.cancel(activityId, expectedNotifId)
-        }
-
-        // Drain the main looper to execute the postDelayed dismiss task.
-        Shadows.shadowOf(android.os.Looper.getMainLooper()).runToEndOfTasks()
-        ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
-
         verify(exactly = 1) {
             notificationManager.cancel(activityId, expectedNotifId)
         }
     }
 
     @Test
-    fun handle_givenEventStart_doesNotScheduleCancel() {
+    fun handle_givenEventStart_doesNotCancel() {
         val activityId = "starting-activity"
         val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
         val bundle = newBundle(activityId = activityId, event = "start")
 
         invoke(handlerFor(bundle))
-        ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
 
         verify(exactly = 1) {
             notificationManager.notify(activityId, expectedNotifId, any<Notification>())
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt
index 4f1e1c1d6..b7c5e7f8a 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplateTest.kt
@@ -26,8 +26,7 @@ internal class AuctionBidTemplateTest : IntegrationTest() {
         contentState: JSONObject = JSONObject()
     ): TemplateRenderResult = AuctionBidTemplate.render(
         context = contextMock,
-        attributes = attributes,
-        contentState = contentState,
+        data = flatten(attributes, contentState),
         branding = null,
         smallIcon = 0,
         fallbackTintColor = null
@@ -157,41 +156,4 @@ internal class AuctionBidTemplateTest : IntegrationTest() {
 
         (result.countdownUntil == null).shouldBeTrue()
     }
-
-    // --- Strict-slotting regression guards ---
-
-    @Test
-    fun render_isUserHighBidderInAttributes_isIgnored() {
-        val attributes = baseAttributes().apply {
-            put("isUserHighBidder", true) // wrong slot
-        }
-        val contentState = JSONObject().apply {
-            put("currentBid", "1,000")
-            put("bidCount", 1)
-            put("statusMessage", "x")
-            // Note: no isUserHighBidder here, so it defaults to false → red.
-        }
-
-        val result = render(attributes, contentState)
-
-        result.accentColor shouldBeEqualTo outbidRed
-    }
-
-    @Test
-    fun render_currencySymbolInContentState_isIgnoredAndDefaultsApply() {
-        val attributes = JSONObject().apply {
-            put("itemTitle", "x") // no currencySymbol in attributes
-        }
-        val contentState = JSONObject().apply {
-            put("currencySymbol", "€") // wrong slot
-            put("currentBid", "1")
-            put("bidCount", 1)
-            put("statusMessage", "x")
-        }
-
-        val result = render(attributes, contentState)
-
-        // The misplaced currency symbol must be ignored; default `$` is applied.
-        result.body shouldBeEqualTo "x · $1"
-    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt
index e58df4d17..3d65e9c9a 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplateTest.kt
@@ -27,8 +27,7 @@ internal class CountdownTimerTemplateTest : IntegrationTest() {
         contentState: JSONObject = JSONObject()
     ): TemplateRenderResult = CountdownTimerTemplate.render(
         context = contextMock,
-        attributes = attributes,
-        contentState = contentState,
+        data = flatten(attributes, contentState),
         branding = null,
         smallIcon = 0,
         fallbackTintColor = null
@@ -114,37 +113,4 @@ internal class CountdownTimerTemplateTest : IntegrationTest() {
 
         result.largeIcon.shouldBeNull()
     }
-
-    // --- Strict-slotting regression guards ---
-
-    @Test
-    fun render_titleInContentState_isIgnored() {
-        val attributes = JSONObject() // intentionally empty: no title
-        val contentState = JSONObject().apply {
-            put("title", "MISPLACED")
-            put("targetDate", System.currentTimeMillis() + 60_000L)
-            put("statusMessage", "msg")
-        }
-
-        val result = render(attributes, contentState)
-
-        result.title shouldBeEqualTo "" // empty, because the misplaced value is ignored
-    }
-
-    @Test
-    fun render_targetDateInAttributes_isIgnored() {
-        val past = System.currentTimeMillis() - 60_000L
-        val attributes = titleAttributes().apply {
-            put("targetDate", past) // wrong slot
-        }
-        val contentState = JSONObject().apply {
-            put("statusMessage", "Pre-sale")
-        }
-
-        val result = render(attributes, contentState)
-
-        // No targetDate seen by the template ⇒ treated as pre-target with statusMessage.
-        result.body shouldBeEqualTo "Pre-sale"
-        result.cancelImmediately.shouldBeFalse()
-    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt
index 50ce9364c..97daf5fe2 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplateTest.kt
@@ -2,22 +2,19 @@ package io.customer.messagingpush.livenotification.template
 
 import io.customer.messagingpush.testutils.core.IntegrationTest
 import org.amshove.kluent.shouldBeEqualTo
-import org.amshove.kluent.shouldBeFalse
 import org.amshove.kluent.shouldBeNull
 import org.amshove.kluent.shouldBeTrue
-import org.amshove.kluent.shouldContain
 import org.json.JSONObject
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
 /**
- * Tests [DeliveryTrackingTemplate] rendering against the documented per-slot schema.
+ * Tests [DeliveryTrackingTemplate] rendering against the documented field schema.
  *
- * The template lives behind the strict-slotting decision: `orderId` and
- * `recipientName` arrive only in `attributes`; everything dynamic arrives in
- * `content_state`. Mis-slotted fields must be silently ignored so the rendering
- * stays predictable as the cross-platform spec evolves.
+ * All fields arrive flattened in a single `data` object; the legacy
+ * `attributes` / `content_state` grouping in these tests is purely for
+ * readability and is merged via [flatten] before rendering.
  */
 @RunWith(RobolectricTestRunner::class)
 internal class DeliveryTrackingTemplateTest : IntegrationTest() {
@@ -27,8 +24,7 @@ internal class DeliveryTrackingTemplateTest : IntegrationTest() {
         contentState: JSONObject = JSONObject()
     ): TemplateRenderResult = DeliveryTrackingTemplate.render(
         context = contextMock,
-        attributes = attributes,
-        contentState = contentState,
+        data = flatten(attributes, contentState),
         branding = null,
         smallIcon = 0,
         fallbackTintColor = null
@@ -168,42 +164,4 @@ internal class DeliveryTrackingTemplateTest : IntegrationTest() {
 
         result.countdownUntil.shouldBeNull()
     }
-
-    // --- Strict-slotting regression guards ---
-
-    @Test
-    fun render_orderIdInContentState_isIgnored() {
-        // Mis-slotted `orderId` must NOT be picked up from content_state.
-        // This is what locks the strict-slotting decision against future regressions.
-        val attributes = JSONObject()
-        val contentState = JSONObject().apply {
-            put("orderId", "MISPLACED")
-            put("statusMessage", "no order")
-            put("stepTotal", 2)
-        }
-
-        val result = render(attributes, contentState)
-
-        result.title shouldBeEqualTo "Order #"
-        // SubText should not contain the misplaced order id.
-        (result.subText ?: "").shouldContain("").also {
-            (result.subText?.contains("MISPLACED") == true).shouldBeFalse()
-        }
-    }
-
-    @Test
-    fun render_statusMessageInAttributes_isIgnored() {
-        // statusMessage belongs in content_state — putting it in attributes leaves body empty.
-        val attributes = JSONObject().apply {
-            put("orderId", "X")
-            put("statusMessage", "MISPLACED MESSAGE")
-        }
-        val contentState = JSONObject().apply {
-            put("stepTotal", 2)
-        }
-
-        val result = render(attributes, contentState)
-
-        result.body shouldBeEqualTo ""
-    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt
index a8c66370d..443fcfc06 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplateTest.kt
@@ -16,8 +16,9 @@ import org.robolectric.RobolectricTestRunner
  * - basic title/body/subText composition with origin / destination codes;
  * - the delay-red branch — `delayMinutes > 0` flips the accent and suffixes the body;
  * - countdown target switching: `progressFraction` present ⇒ estimatedArrival,
- *   absent ⇒ scheduledDeparture;
- * - strict slotting — `flightNumber` in `content_state` is ignored.
+ *   absent ⇒ scheduledDeparture.
+ *
+ * All fields arrive flattened; the legacy grouping is merged via [flatten].
  */
 @RunWith(RobolectricTestRunner::class)
 internal class FlightStatusTemplateTest : IntegrationTest() {
@@ -29,8 +30,7 @@ internal class FlightStatusTemplateTest : IntegrationTest() {
         contentState: JSONObject = JSONObject()
     ): TemplateRenderResult = FlightStatusTemplate.render(
         context = contextMock,
-        attributes = attributes,
-        contentState = contentState,
+        data = flatten(attributes, contentState),
         branding = null,
         smallIcon = 0,
         fallbackTintColor = null
@@ -144,37 +144,4 @@ internal class FlightStatusTemplateTest : IntegrationTest() {
 
         result.progress shouldBeEqualTo 100
     }
-
-    // --- Strict-slotting regression guard ---
-
-    @Test
-    fun render_flightNumberInContentState_isIgnored() {
-        val attributes = JSONObject().apply {
-            put("origin", JSONObject().put("code", "JFK"))
-            put("destination", JSONObject().put("code", "LAX"))
-        }
-        val contentState = JSONObject().apply {
-            put("flightNumber", "MISPLACED")
-            put("statusMessage", "x")
-        }
-
-        val result = render(attributes, contentState)
-
-        result.title shouldBeEqualTo " · JFK → LAX" // flightNumber empty, prefix space remains
-    }
-
-    @Test
-    fun render_delayMinutesInAttributes_isIgnored() {
-        val attributes = baseAttributes().apply {
-            put("delayMinutes", 25) // wrong slot
-        }
-        val contentState = JSONObject().apply {
-            put("statusMessage", "x")
-        }
-
-        val result = render(attributes, contentState)
-
-        (result.accentColor == delayRed).shouldBeFalse()
-        result.body shouldBeEqualTo "x"
-    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt
index 9f180b044..ee330cabb 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplateTest.kt
@@ -13,7 +13,7 @@ import org.robolectric.RobolectricTestRunner
  * Exercises the body composition fallback chain:
  * `statusMessage` overrides ⇒ `period · clock` ⇒ bare `period`.
  *
- * Also locks the strict-slotting decision — `homeScore` in `attributes` is ignored.
+ * All fields arrive flattened; the legacy grouping is merged via [flatten].
  */
 @RunWith(RobolectricTestRunner::class)
 internal class LiveScoreTemplateTest : IntegrationTest() {
@@ -23,8 +23,7 @@ internal class LiveScoreTemplateTest : IntegrationTest() {
         contentState: JSONObject = JSONObject()
     ): TemplateRenderResult = LiveScoreTemplate.render(
         context = contextMock,
-        attributes = attributes,
-        contentState = contentState,
+        data = flatten(attributes, contentState),
         branding = null,
         smallIcon = 0,
         fallbackTintColor = null
@@ -110,42 +109,4 @@ internal class LiveScoreTemplateTest : IntegrationTest() {
 
         result.title shouldBeEqualTo " 3 - 0 "
     }
-
-    // --- Strict-slotting regression guards ---
-
-    @Test
-    fun render_homeScoreInAttributes_isIgnored() {
-        val attributes = teamsAttributes().apply {
-            put("homeScore", 99) // wrong slot
-        }
-        val contentState = JSONObject().apply {
-            put("awayScore", 7)
-            put("period", "1st")
-        }
-
-        val result = render(attributes, contentState)
-
-        // homeScore defaults to 0 in content_state, because the misplaced value must be ignored.
-        result.title shouldBeEqualTo "Lakers 0 - 7 Celtics"
-    }
-
-    @Test
-    fun render_leagueLogoKeyInContentState_isIgnored() {
-        // leagueLogoKey belongs in `attributes` per the spec. Misplaced should not resolve.
-        val attributes = teamsAttributes()
-        val contentState = JSONObject().apply {
-            put("homeScore", 0)
-            put("awayScore", 0)
-            put("period", "1st")
-            put("leagueLogoKey", "league_nba")
-        }
-
-        val result = render(attributes, contentState)
-
-        // largeIcon should be null because the misplaced key was not consulted.
-        // (No host-app drawable was registered for "league_nba" anyway, but the contract
-        // we lock here is "don't even attempt to resolve from content_state".)
-        // We can't observe `attempted` directly; we can observe the slot still produces null.
-        result.largeIcon shouldBeEqualTo null
-    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateTestData.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateTestData.kt
new file mode 100644
index 000000000..183afb0cb
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/template/TemplateTestData.kt
@@ -0,0 +1,20 @@
+package io.customer.messagingpush.livenotification.template
+
+import org.json.JSONObject
+
+/**
+ * Merges JSON objects into a single flattened [JSONObject], mirroring how the
+ * backend now delivers all live-notification template fields at the envelope
+ * top level (no `attributes` / `content_state` split). Lets per-template tests
+ * keep expressing inputs as two logical groups while exercising the flattened
+ * `render(data = …)` contract.
+ */
+internal fun flatten(vararg objects: JSONObject): JSONObject {
+    val data = JSONObject()
+    for (obj in objects) {
+        for (key in obj.keys()) {
+            data.put(key, obj.get(key))
+        }
+    }
+    return data
+}
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
index a04915665..c9ae523ec 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
@@ -22,10 +22,11 @@
  * <p>
  * Each scenario builds a templated FCM data bundle that matches the
  * cross-platform live-activity envelope: top-level lifecycle keys
- * ({@code activity_id}, {@code event}, {@code activity_type}) plus two JSON
- * strings, {@code attributes} (static fields) and {@code content_state}
- * (dynamic fields). The static branding bundle lives in
- * {@code MessagingPushModuleConfig} and is registered once at SDK init.
+ * ({@code activity_id}, {@code event}, {@code activity_type}) plus the
+ * template fields flattened alongside them (Android does not split static
+ * {@code attributes} from dynamic {@code content_state}). The static branding
+ * bundle lives in {@code MessagingPushModuleConfig} and is registered once at
+ * SDK init.
  */
 public class LiveNotificationDemoActivity extends BaseActivity<ActivityLiveNotificationDemoBinding> {
 
@@ -36,13 +37,13 @@ public class LiveNotificationDemoActivity extends BaseActivity<ActivityLiveNotif
     private static final String EVENT_UPDATE = "update";
     private static final String EVENT_END = "end";
 
-    // activity_type values are prefixed per the cross-platform spec.
-    private static final String ACTIVITY_TYPE_DELIVERY_TRACKING = "io.customer.live.delivery_tracking";
-    private static final String ACTIVITY_TYPE_FLIGHT_STATUS = "io.customer.live.flight_status";
-    private static final String ACTIVITY_TYPE_LIVE_SCORE = "io.customer.live.live_score";
-    private static final String ACTIVITY_TYPE_COUNTDOWN_TIMER = "io.customer.live.countdown_timer";
-    private static final String ACTIVITY_TYPE_AUCTION_BID = "io.customer.live.auction_bid";
-    private static final String ACTIVITY_TYPE_UNKNOWN = "io.customer.live.bogus";
+    // activity_type values match the iOS Live Activity identifiers per the cross-platform spec.
+    private static final String ACTIVITY_TYPE_DELIVERY_TRACKING = "io.customer.liveactivities.deliverytracking";
+    private static final String ACTIVITY_TYPE_FLIGHT_STATUS = "io.customer.liveactivities.flightstatus";
+    private static final String ACTIVITY_TYPE_LIVE_SCORE = "io.customer.liveactivities.livescore";
+    private static final String ACTIVITY_TYPE_COUNTDOWN_TIMER = "io.customer.liveactivities.countdowntimer";
+    private static final String ACTIVITY_TYPE_AUCTION_BID = "io.customer.liveactivities.auctionbid";
+    private static final String ACTIVITY_TYPE_UNKNOWN = "io.customer.liveactivities.bogus";
 
     private enum TemplateChoice {
         DELIVERY_TRACKING, FLIGHT_STATUS, LIVE_SCORE, COUNTDOWN_TIMER, AUCTION_BID
@@ -329,11 +330,24 @@ private Bundle buildBundle(
         bundle.putString("activity_id", activityId);
         bundle.putString("event", event);
         bundle.putString("activity_type", activityType);
-        bundle.putString("attributes", attributes.toString());
-        bundle.putString("content_state", contentState.toString());
+        // The backend sends template fields flattened at the envelope top level.
+        putFlattened(bundle, attributes);
+        putFlattened(bundle, contentState);
         return bundle;
     }
 
+    private void putFlattened(Bundle bundle, JSONObject obj) {
+        java.util.Iterator<String> keys = obj.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            Object value = obj.opt(key);
+            if (value == null || value == JSONObject.NULL) continue;
+            // Nested objects (origin, homeTeam, …) ride along as JSON strings,
+            // matching how FCM delivers non-scalar data values.
+            bundle.putString(key, value.toString());
+        }
+    }
+
     private void fire(Bundle bundle) {
         RemoteMessage remoteMessage = new RemoteMessage(bundle);
         CustomerIOFirebaseMessagingService.onMessageReceived(this, remoteMessage);

From 7dc9f19f75ee0dcb999ad3a3032582ba75f0f29c Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Thu, 11 Jun 2026 18:50:25 +0400
Subject: [PATCH 08/10] chore(live-notifications): backend lifecycle reporting
 + out-of-order/dismissal handling (#723)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../sdk/core/network/CustomerIOHttpClient.kt  | 26 +++++-
 messagingpush/api/messagingpush.api           | 10 ++
 messagingpush/src/main/AndroidManifest.xml    |  9 ++
 .../Api36LiveNotificationBuilder.kt           |  2 +
 .../messagingpush/BasicNotificationBuilder.kt |  2 +
 .../messagingpush/LiveNotificationHandler.kt  | 70 +++++++++++++-
 .../messagingpush/ModuleMessagingPushFCM.kt   |  4 +
 .../messagingpush/di/DiGraphMessagingPush.kt  | 15 +++
 .../LiveNotificationDismissReceiver.kt        | 39 ++++++++
 .../LiveNotificationLifecycleClient.kt        | 92 +++++++++++++++++++
 .../LiveNotificationRegistrar.kt              | 66 +++++++++++++
 .../livenotification/LiveNotificationStore.kt | 74 +++++++++++++++
 .../template/TemplateRegistry.kt              |  9 ++
 .../LiveNotificationHandlerTest.kt            | 63 ++++++++++++-
 .../LiveNotificationLifecycleClientTest.kt    | 92 +++++++++++++++++++
 .../LiveNotificationStoreTest.kt              | 56 +++++++++++
 16 files changed, 622 insertions(+), 7 deletions(-)
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationStore.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationStoreTest.kt

diff --git a/core/src/main/kotlin/io/customer/sdk/core/network/CustomerIOHttpClient.kt b/core/src/main/kotlin/io/customer/sdk/core/network/CustomerIOHttpClient.kt
index f9adc05d0..1d922ef4a 100644
--- a/core/src/main/kotlin/io/customer/sdk/core/network/CustomerIOHttpClient.kt
+++ b/core/src/main/kotlin/io/customer/sdk/core/network/CustomerIOHttpClient.kt
@@ -10,23 +10,41 @@ import java.net.HttpURLConnection
 import java.net.MalformedURLException
 import java.net.URL
 
+@InternalCustomerIOApi
+enum class HttpMethod { GET, POST, PUT, DELETE }
+
 @InternalCustomerIOApi
 data class HttpRequestParams(
     val path: String,
+    val method: HttpMethod = HttpMethod.POST,
     val headers: Map<String, String> = emptyMap(),
     val body: String? = null
 )
 
+/**
+ * IOException carrying the HTTP [statusCode] for non-2xx responses ([statusCode]
+ * is null for transport-level failures). Lets callers apply status-aware retry
+ * (e.g. retry 5xx, skip 4xx) without parsing the message.
+ */
+@InternalCustomerIOApi
+class HttpRequestException(
+    val statusCode: Int?,
+    message: String,
+    cause: Throwable? = null
+) : IOException(message, cause)
+
 /** HTTP client for Customer.io API calls with SDK authentication. */
 @InternalCustomerIOApi
 interface CustomerIOHttpClient {
     /**
-     * Performs a POST request to [params.path] with [params.headers] and [params.body].
+     * Performs an HTTP request to [params.path] using [params.method], with
+     * [params.headers] and [params.body].
      *
-     * @param params The request parameters (path, headers, body).
+     * @param params The request parameters (path, method, headers, body).
      * @return A `Result<String>`:
      *   - `Result.success(responseBody)` for 2xx response codes
      *   - `Result.failure(exception)` for network errors or non-2xx codes
+     *     (an [HttpRequestException] for non-2xx, carrying the status code)
      */
     suspend fun request(params: HttpRequestParams): Result<String>
 }
@@ -66,7 +84,7 @@ internal class CustomerIOHttpClientImpl : CustomerIOHttpClient {
             // Configure the connection
             connection.connectTimeout = connectTimeoutMs
             connection.readTimeout = readTimeoutMs
-            connection.requestMethod = "POST"
+            connection.requestMethod = params.method.name
             connection.setRequestProperty("User-Agent", client.toString())
 
             // Authorization: Basic <base64("writeKey:")>
@@ -101,7 +119,7 @@ internal class CustomerIOHttpClientImpl : CustomerIOHttpClient {
             if (responseCode in 200..299) {
                 Result.success(responseBody)
             } else {
-                Result.failure(IOException("HTTP $responseCode: $responseBody"))
+                Result.failure(HttpRequestException(responseCode, "HTTP $responseCode: $responseBody"))
             }
         } catch (e: IOException) {
             Result.failure(e)
diff --git a/messagingpush/api/messagingpush.api b/messagingpush/api/messagingpush.api
index 5318aad56..d44f2e72e 100644
--- a/messagingpush/api/messagingpush.api
+++ b/messagingpush/api/messagingpush.api
@@ -141,6 +141,16 @@ public final class io/customer/messagingpush/livenotification/LiveNotificationBr
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver : android/content/BroadcastReceiver {
+	public static final field Companion Lio/customer/messagingpush/livenotification/LiveNotificationDismissReceiver$Companion;
+	public static final field EXTRA_ACTIVITY_ID Ljava/lang/String;
+	public fun <init> ()V
+	public fun onReceive (Landroid/content/Context;Landroid/content/Intent;)V
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver$Companion {
+}
+
 public final class io/customer/messagingpush/processor/PushMessageProcessor$Companion {
 	public static final field RECENT_MESSAGES_MAX_SIZE I
 	public final fun getRecentMessagesQueue ()Ljava/util/concurrent/LinkedBlockingDeque;
diff --git a/messagingpush/src/main/AndroidManifest.xml b/messagingpush/src/main/AndroidManifest.xml
index 6e3206260..2eb445d4d 100644
--- a/messagingpush/src/main/AndroidManifest.xml
+++ b/messagingpush/src/main/AndroidManifest.xml
@@ -44,6 +44,15 @@
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </receiver>
+
+        <!--
+        Receives the delete intent fired when a user dismisses a live notification,
+        so the SDK can report the dismissal to Customer.io. Triggered via an explicit
+        PendingIntent only, so it does not need to be exported.
+        -->
+        <receiver
+            android:name=".livenotification.LiveNotificationDismissReceiver"
+            android:exported="false" />
     </application>
 
     <queries>
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
index ed131574e..f3c3d726a 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
@@ -41,6 +41,7 @@ internal data class Api36LiveNotificationParams(
     @DrawableRes val endIconRes: Int?,
     @DrawableRes val trackerIconRes: Int?,
     val pendingIntent: PendingIntent?,
+    val deleteIntent: PendingIntent?,
     val countdownUntil: Long?,
     val largeIcon: Bitmap?,
     val showProgress: Boolean
@@ -137,6 +138,7 @@ internal object Api36LiveNotificationBuilder {
         params.subText?.let { builder.setSubText(it) }
         params.accentColor?.let { builder.setColor(it) }
         params.pendingIntent?.let { builder.setContentIntent(it) }
+        params.deleteIntent?.let { builder.setDeleteIntent(it) }
 
         return builder.build()
     }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
index cb8ad82de..42ecda66e 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
@@ -37,6 +37,7 @@ internal data class BasicNotificationParams(
     val progress: Int,
     val progressMax: Int,
     val pendingIntent: PendingIntent?,
+    val deleteIntent: PendingIntent?,
     val countdownUntil: Long?,
     val largeIcon: Bitmap?,
     val showProgress: Boolean
@@ -86,6 +87,7 @@ internal object BasicNotificationBuilder {
             builder.setColorized(true)
         }
         params.pendingIntent?.let { builder.setContentIntent(it) }
+        params.deleteIntent?.let { builder.setDeleteIntent(it) }
 
         return builder.build()
     }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
index a4523ea09..338658d47 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
@@ -7,13 +7,17 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import io.customer.messagingpush.activity.NotificationClickReceiverActivity
 import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
+import io.customer.messagingpush.di.liveNotificationStore
 import io.customer.messagingpush.di.pushModuleConfig
 import io.customer.messagingpush.livenotification.LiveNotificationBranding
+import io.customer.messagingpush.livenotification.LiveNotificationDismissReceiver
 import io.customer.messagingpush.livenotification.template.TemplateAssets
 import io.customer.messagingpush.livenotification.template.TemplateRegistry
 import io.customer.messagingpush.util.PushTrackingUtil
@@ -95,6 +99,21 @@ internal class LiveNotificationHandler(
             )
             return
         }
+
+        // Out-of-order / duplicate guard. Android renders FCM data directly, so unlike
+        // iOS (where APNs/ActivityKit order updates) the SDK must drop stale pushes itself.
+        val store = SDKComponent.liveNotificationStore
+        val timestamp = bundle.getString(TIMESTAMP_KEY)?.toLongOrNull()
+        if (timestamp != null) {
+            val lastSeen = store.lastTimestamp(activityId)
+            if (lastSeen != null && timestamp <= lastSeen) {
+                SDKComponent.logger.debug(
+                    "Dropping out-of-order/duplicate live notification for '$activityId' (timestamp $timestamp <= $lastSeen)."
+                )
+                return
+            }
+        }
+
         val activityType = bundle.getString(ACTIVITY_TYPE_KEY)
         val template = TemplateRegistry.find(activityType)
         if (template == null) {
@@ -104,6 +123,12 @@ internal class LiveNotificationHandler(
             return
         }
 
+        // We have committed to acting on this push: record its timestamp so later,
+        // out-of-order pushes for the same activity are dropped. `end` clears it below.
+        if (event != EVENT_END && timestamp != null) {
+            store.setLastTimestamp(activityId, timestamp)
+        }
+
         val data = extractData(bundle)
         val branding = SDKComponent.pushModuleConfig.liveNotificationBranding
         val effectiveSmallIcon = resolveSmallIcon(context, branding, smallIcon)
@@ -134,6 +159,7 @@ internal class LiveNotificationHandler(
             activityId = activityId
         )
         val pendingIntent = createIntentForNotificationClick(context, notifId, parsedPayload)
+        val deletePendingIntent = createDeleteIntent(context, notifId, activityId)
 
         val notification = when {
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> {
@@ -153,6 +179,7 @@ internal class LiveNotificationHandler(
                     endIconRes = result.endIconRes,
                     trackerIconRes = result.trackerIconRes,
                     pendingIntent = pendingIntent,
+                    deleteIntent = deletePendingIntent,
                     countdownUntil = result.countdownUntil,
                     largeIcon = result.largeIcon,
                     showProgress = result.showProgress
@@ -172,6 +199,7 @@ internal class LiveNotificationHandler(
                     progress = result.progress,
                     progressMax = result.progressMax,
                     pendingIntent = pendingIntent,
+                    deleteIntent = deletePendingIntent,
                     countdownUntil = result.countdownUntil,
                     largeIcon = result.largeIcon,
                     showProgress = result.showProgress
@@ -183,10 +211,48 @@ internal class LiveNotificationHandler(
         notificationManager.notify(activityId, notifId, notification)
 
         if (event == EVENT_END) {
-            // Without a dismissal_date the activity is removed immediately.
-            // Scheduled dismissal via dismissal_date is added with lifecycle reporting.
+            store.clearTimestamp(activityId)
+            scheduleEndDismissal(bundle, notificationManager, activityId, notifId)
+        }
+    }
+
+    /**
+     * On `end`, removes the notification at the server-provided `dismissal_date`
+     * (epoch ms). When absent, the activity is removed immediately — there is no
+     * invented default delay. (Best-effort: a long delay does not survive
+     * process death.)
+     */
+    private fun scheduleEndDismissal(
+        bundle: Bundle,
+        notificationManager: NotificationManager,
+        activityId: String,
+        notifId: Int
+    ) {
+        val dismissAtMs = bundle.getString(DISMISSAL_DATE_KEY)?.toLongOrNull()
+        if (dismissAtMs == null) {
             notificationManager.cancel(activityId, notifId)
+            return
+        }
+        val delayMs = (dismissAtMs - System.currentTimeMillis()).coerceAtLeast(0L)
+        Handler(Looper.getMainLooper()).postDelayed({
+            notificationManager.cancel(activityId, notifId)
+        }, delayMs)
+    }
+
+    private fun createDeleteIntent(
+        context: Context,
+        requestCode: Int,
+        activityId: String
+    ): PendingIntent {
+        val intent = Intent(context, LiveNotificationDismissReceiver::class.java).apply {
+            putExtra(LiveNotificationDismissReceiver.EXTRA_ACTIVITY_ID, activityId)
+        }
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
         }
+        return PendingIntent.getBroadcast(context, requestCode, intent, flags)
     }
 
     /**
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt b/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
index c2eb955cd..18e6371ed 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.WorkManager
 import androidx.work.await
 import io.customer.messagingpush.di.fcmTokenProvider
+import io.customer.messagingpush.di.liveNotificationRegistrar
 import io.customer.messagingpush.di.pendingPushDeliveryStore
 import io.customer.messagingpush.di.pushLogger
 import io.customer.messagingpush.di.pushTrackingUtil
@@ -48,6 +49,9 @@ class ModuleMessagingPushFCM @JvmOverloads constructor(
         get() = MODULE_NAME
 
     override fun initialize() {
+        // Start before requesting the token so the registrar observes the resulting
+        // RegisterDeviceTokenEvent and registers the built-in live-notification types.
+        SDKComponent.liveNotificationRegistrar.start()
         getCurrentFcmToken()
         subscribeToLifecycleEvents()
         observeProcessForeground()
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt b/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
index 039497636..5382adadf 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
@@ -10,6 +10,10 @@ import io.customer.messagingpush.MessagingPushModuleConfig
 import io.customer.messagingpush.ModuleMessagingPushFCM
 import io.customer.messagingpush.PushDeliveryTracker
 import io.customer.messagingpush.PushDeliveryTrackerImpl
+import io.customer.messagingpush.livenotification.LiveNotificationLifecycleClient
+import io.customer.messagingpush.livenotification.LiveNotificationLifecycleClientImpl
+import io.customer.messagingpush.livenotification.LiveNotificationRegistrar
+import io.customer.messagingpush.livenotification.LiveNotificationStore
 import io.customer.messagingpush.logger.PushNotificationLogger
 import io.customer.messagingpush.processor.PushDeliveryMetricsBackgroundScheduler
 import io.customer.messagingpush.processor.PushMessageProcessor
@@ -86,6 +90,17 @@ internal val SDKComponent.pushMessageProcessor: PushMessageProcessor
         )
     }
 
+internal val SDKComponent.liveNotificationStore: LiveNotificationStore
+    get() = singleton<LiveNotificationStore> { LiveNotificationStore(android().applicationContext) }
+
+internal val SDKComponent.liveNotificationLifecycleClient: LiveNotificationLifecycleClient
+    get() = singleton<LiveNotificationLifecycleClient> { LiveNotificationLifecycleClientImpl() }
+
+internal val SDKComponent.liveNotificationRegistrar: LiveNotificationRegistrar
+    get() = singleton<LiveNotificationRegistrar> {
+        LiveNotificationRegistrar(liveNotificationLifecycleClient, liveNotificationStore)
+    }
+
 internal val SDKComponent.pushDeliveryTracker: PushDeliveryTracker
     get() = singleton<PushDeliveryTracker> { PushDeliveryTrackerImpl() }
 
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver.kt
new file mode 100644
index 000000000..6d4f17125
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver.kt
@@ -0,0 +1,39 @@
+package io.customer.messagingpush.livenotification
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import io.customer.messagingpush.di.liveNotificationLifecycleClient
+import io.customer.sdk.core.di.SDKComponent
+import io.customer.sdk.core.di.setupAndroidComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+/**
+ * Receives the delete intent the system fires when the user dismisses a live
+ * notification, and reports the dismissal to the backend.
+ *
+ * Programmatic [android.app.NotificationManager.cancel] does NOT trigger a
+ * delete intent, so server-driven `end` events (which cancel the notification)
+ * do not produce a false user-dismissal report.
+ */
+class LiveNotificationDismissReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val activityId = intent.getStringExtra(EXTRA_ACTIVITY_ID) ?: return
+        SDKComponent.setupAndroidComponent(context = context)
+        // Keep the receiver alive for the short-lived network call.
+        val pendingResult = goAsync()
+        CoroutineScope(SDKComponent.dispatchersProvider.background).launch {
+            try {
+                SDKComponent.liveNotificationLifecycleClient.reportDismissed(activityId)
+            } finally {
+                pendingResult.finish()
+            }
+        }
+    }
+
+    companion object {
+        const val EXTRA_ACTIVITY_ID = "io.customer.messagingpush.EXTRA_LIVE_ACTIVITY_ID"
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt
new file mode 100644
index 000000000..206798377
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt
@@ -0,0 +1,92 @@
+package io.customer.messagingpush.livenotification
+
+import io.customer.sdk.core.di.SDKComponent
+import io.customer.sdk.core.di.httpClient
+import io.customer.sdk.core.network.CustomerIOHttpClient
+import io.customer.sdk.core.network.HttpMethod
+import io.customer.sdk.core.network.HttpRequestException
+import io.customer.sdk.core.network.HttpRequestParams
+import kotlinx.coroutines.delay
+import org.json.JSONObject
+
+/**
+ * Reports live-notification lifecycle to the Customer.io backend.
+ *
+ * Android has no push-to-start token like iOS; [registerForActivityType]
+ * instead registers the device's FCM token per activity type so the backend
+ * can push updates for it (`os = android`, `transport = fcm`).
+ * [reportDismissed] mirrors iOS's terminal-state DELETE, fired when the user
+ * dismisses the notification.
+ */
+internal interface LiveNotificationLifecycleClient {
+    suspend fun registerForActivityType(activityType: String, token: String, userId: String): Result<Unit>
+
+    suspend fun reportDismissed(activityId: String): Result<Unit>
+}
+
+internal class LiveNotificationLifecycleClientImpl(
+    private val httpClient: CustomerIOHttpClient = SDKComponent.httpClient
+) : LiveNotificationLifecycleClient {
+
+    override suspend fun registerForActivityType(
+        activityType: String,
+        token: String,
+        userId: String
+    ): Result<Unit> {
+        val body = JSONObject().apply {
+            put("token", token)
+            put("os", OS_ANDROID)
+            put("transport", TRANSPORT_FCM)
+            put("userId", userId)
+        }
+        return send(
+            HttpRequestParams(
+                path = "/v1/live_activities/registration/$activityType",
+                method = HttpMethod.PUT,
+                headers = JSON_HEADERS,
+                body = body.toString()
+            )
+        )
+    }
+
+    override suspend fun reportDismissed(activityId: String): Result<Unit> {
+        return send(
+            HttpRequestParams(
+                path = "/v1/live_activities/$activityId",
+                method = HttpMethod.DELETE,
+                headers = JSON_HEADERS,
+                body = "{}"
+            )
+        )
+    }
+
+    /**
+     * Sends [params], retrying transport failures and 5xx responses up to
+     * [MAX_ATTEMPTS] with linear backoff. 4xx responses are not retried
+     * (mirrors the iOS lifecycle client policy).
+     */
+    private suspend fun send(params: HttpRequestParams): Result<Unit> {
+        var attempt = 0
+        while (true) {
+            attempt++
+            val result = httpClient.request(params)
+            if (result.isSuccess) return Result.success(Unit)
+
+            val error = result.exceptionOrNull()
+            val statusCode = (error as? HttpRequestException)?.statusCode
+            val isClientError = statusCode != null && statusCode in 400..499
+            if (isClientError || attempt >= MAX_ATTEMPTS) {
+                return Result.failure(error ?: IllegalStateException("Live notification request failed"))
+            }
+            delay(BASE_BACKOFF_MS * attempt)
+        }
+    }
+
+    companion object {
+        private const val OS_ANDROID = "android"
+        private const val TRANSPORT_FCM = "fcm"
+        private const val MAX_ATTEMPTS = 3
+        private const val BASE_BACKOFF_MS = 500L
+        private val JSON_HEADERS = mapOf("Content-Type" to "application/json; charset=utf-8")
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt
new file mode 100644
index 000000000..c9d0f496d
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt
@@ -0,0 +1,66 @@
+package io.customer.messagingpush.livenotification
+
+import io.customer.messagingpush.livenotification.template.TemplateRegistry
+import io.customer.sdk.communication.Event
+import io.customer.sdk.core.di.SDKComponent
+import io.customer.sdk.core.di.SDKComponent.eventBus
+
+/**
+ * Registers the device's FCM token with the backend for each built-in
+ * live-notification template type — the Android analogue of iOS push-to-start
+ * registration — and keeps it current.
+ *
+ * Registration is (re)attempted whenever the device token rotates
+ * ([Event.RegisterDeviceTokenEvent]) or the user changes
+ * ([Event.UserChangedEvent]), and is deduped per activity type via
+ * [LiveNotificationStore] (signature = `token|userId`). Token deletion / reset
+ * clears the stored signatures so the next token re-registers.
+ */
+internal class LiveNotificationRegistrar(
+    private val client: LiveNotificationLifecycleClient,
+    private val store: LiveNotificationStore
+) {
+
+    @Volatile
+    private var token: String? = null
+
+    @Volatile
+    private var userId: String = ""
+
+    fun start() {
+        // Drop dedup entries for activities that ended long ago without an explicit `end`.
+        store.trimStaleTimestamps()
+
+        eventBus.subscribe(Event.RegisterDeviceTokenEvent::class) { event ->
+            token = event.token
+            registerAll()
+        }
+        eventBus.subscribe(Event.UserChangedEvent::class) { event ->
+            userId = event.userId ?: event.anonymousId
+            registerAll()
+        }
+        eventBus.subscribe(Event.DeleteDeviceTokenEvent::class) {
+            token = null
+            store.clearRegistrations()
+        }
+        eventBus.subscribe(Event.ResetEvent::class) {
+            store.clearRegistrations()
+        }
+    }
+
+    private suspend fun registerAll() {
+        val currentToken = token ?: return
+        val signature = "$currentToken|$userId"
+        for (activityType in TemplateRegistry.builtInTypes) {
+            if (store.registrationSignature(activityType) == signature) continue
+            val result = client.registerForActivityType(activityType, currentToken, userId)
+            if (result.isSuccess) {
+                store.setRegistrationSignature(activityType, signature)
+            } else {
+                SDKComponent.logger.debug(
+                    "Live notification registration failed for '$activityType'; will retry on next token/user change."
+                )
+            }
+        }
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationStore.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationStore.kt
new file mode 100644
index 000000000..889a7fff5
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationStore.kt
@@ -0,0 +1,74 @@
+package io.customer.messagingpush.livenotification
+
+import android.content.Context
+import androidx.core.content.edit
+import java.util.concurrent.TimeUnit
+
+/**
+ * Persistent state for live notifications, backed by a dedicated
+ * SharedPreferences file:
+ *
+ * - **Registration dedup** (per `activity_type`): the last signature
+ *   (`token|userId`) registered with the backend, so repeated app launches /
+ *   unchanged tokens don't re-POST the registration.
+ * - **Out-of-order / dedup guard** (per `activity_id`): the last `timestamp`
+ *   seen, so a delayed or duplicate push that is older than one already
+ *   rendered is dropped. Unlike iOS (where APNs/ActivityKit order updates), the
+ *   Android SDK renders FCM data directly and must guard ordering itself.
+ *
+ * Timestamp entries are stored with their record time so stale ones (for
+ * activities that ended long ago without an explicit `end`) can be trimmed on
+ * app launch.
+ */
+internal class LiveNotificationStore(context: Context) {
+
+    private val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+
+    // --- Registration dedup (per activity_type) ---
+
+    fun registrationSignature(activityType: String): String? =
+        prefs.getString(REG_PREFIX + activityType, null)
+
+    fun setRegistrationSignature(activityType: String, signature: String) {
+        prefs.edit { putString(REG_PREFIX + activityType, signature) }
+    }
+
+    /** Clears all registration signatures, forcing re-registration (e.g. on reset / token deletion). */
+    fun clearRegistrations() {
+        prefs.edit {
+            prefs.all.keys.filter { it.startsWith(REG_PREFIX) }.forEach { remove(it) }
+        }
+    }
+
+    // --- Out-of-order / dedup guard (per activity_id) ---
+
+    /** The last `timestamp` seen for [activityId], or null if none recorded. */
+    fun lastTimestamp(activityId: String): Long? =
+        prefs.getString(TS_PREFIX + activityId, null)?.substringBefore('|')?.toLongOrNull()
+
+    fun setLastTimestamp(activityId: String, timestamp: Long, now: Long = System.currentTimeMillis()) {
+        prefs.edit { putString(TS_PREFIX + activityId, "$timestamp|$now") }
+    }
+
+    fun clearTimestamp(activityId: String) {
+        prefs.edit { remove(TS_PREFIX + activityId) }
+    }
+
+    /** Removes timestamp entries recorded longer than [ttlMs] ago. Intended to run on app launch. */
+    fun trimStaleTimestamps(ttlMs: Long = DEFAULT_TS_TTL_MS, now: Long = System.currentTimeMillis()) {
+        val staleKeys = prefs.all.entries.filter { (key, value) ->
+            key.startsWith(TS_PREFIX) &&
+                ((value as? String)?.substringAfter('|', "")?.toLongOrNull()?.let { now - it > ttlMs } ?: true)
+        }.map { it.key }
+        if (staleKeys.isNotEmpty()) {
+            prefs.edit { staleKeys.forEach { remove(it) } }
+        }
+    }
+
+    companion object {
+        private const val PREFS_NAME = "io.customer.messagingpush.live_notifications"
+        private const val REG_PREFIX = "reg:"
+        private const val TS_PREFIX = "ts:"
+        private val DEFAULT_TS_TTL_MS = TimeUnit.DAYS.toMillis(7)
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
index 7d0d278e0..53dd3bced 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
@@ -8,6 +8,15 @@ internal object TemplateRegistry {
     const val COUNTDOWN_TIMER = "io.customer.liveactivities.countdowntimer"
     const val AUCTION_BID = "io.customer.liveactivities.auctionbid"
 
+    /** The built-in activity types the SDK registers for and can render. */
+    val builtInTypes: List<String> = listOf(
+        DELIVERY_TRACKING,
+        FLIGHT_STATUS,
+        LIVE_SCORE,
+        COUNTDOWN_TIMER,
+        AUCTION_BID
+    )
+
     fun find(name: String?): LiveNotificationTemplate? = when (name) {
         DELIVERY_TRACKING -> DeliveryTrackingTemplate
         FLIGHT_STATUS -> FlightStatusTemplate
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
index 7af358f3e..d09e0ec74 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
@@ -15,6 +15,7 @@ import org.json.JSONObject
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
+import org.robolectric.shadows.ShadowLooper
 
 /**
  * Tests for [LiveNotificationHandler] focused on envelope parsing and dispatch:
@@ -40,12 +41,16 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
         activityId: String? = "live-act-1",
         event: String? = "start",
         activityType: String? = TemplateRegistry.DELIVERY_TRACKING,
-        data: JSONObject = JSONObject()
+        data: JSONObject = JSONObject(),
+        timestamp: Long? = null,
+        dismissalDate: Long? = null
     ): Bundle {
         val bundle = Bundle()
         if (activityId != null) bundle.putString(LiveNotificationHandler.ACTIVITY_ID_KEY, activityId)
         if (event != null) bundle.putString(LiveNotificationHandler.EVENT_KEY, event)
         if (activityType != null) bundle.putString(LiveNotificationHandler.ACTIVITY_TYPE_KEY, activityType)
+        if (timestamp != null) bundle.putString(LiveNotificationHandler.TIMESTAMP_KEY, timestamp.toString())
+        if (dismissalDate != null) bundle.putString(LiveNotificationHandler.DISMISSAL_DATE_KEY, dismissalDate.toString())
         // Template fields ride flattened at the top level, as the backend delivers them.
         for (key in data.keys()) bundle.putString(key, data.get(key).toString())
         return bundle
@@ -239,4 +244,60 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
             notificationManager.cancel(activityId, expectedNotifId)
         }
     }
+
+    // --- Out-of-order / duplicate guard ---
+
+    @Test
+    fun handle_givenOlderTimestamp_dropsTheStalePush() {
+        val activityId = "ooo-activity"
+
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 100L)))
+        // Arrives late and is older than what was already rendered: must be dropped.
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 50L)))
+
+        verify(exactly = 1) {
+            notificationManager.notify(activityId, any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenNewerTimestamp_rendersBoth() {
+        val activityId = "in-order-activity"
+
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 100L)))
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 200L)))
+
+        verify(exactly = 2) {
+            notificationManager.notify(activityId, any<Int>(), any<Notification>())
+        }
+    }
+
+    // --- dismissal_date scheduling on end ---
+
+    @Test
+    fun handle_givenEndWithFutureDismissalDate_cancelsOnlyAfterDelay() {
+        val activityId = "scheduled-end"
+        val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
+        val bundle = newBundle(
+            activityId = activityId,
+            event = "end",
+            dismissalDate = System.currentTimeMillis() + 60_000L
+        )
+
+        invoke(handlerFor(bundle))
+
+        // Posted now, but not cancelled until the dismissal_date is reached.
+        verify(exactly = 1) {
+            notificationManager.notify(activityId, expectedNotifId, any<Notification>())
+        }
+        assertCalledNever {
+            notificationManager.cancel(activityId, expectedNotifId)
+        }
+
+        ShadowLooper.runUiThreadTasksIncludingDelayedTasks()
+
+        verify(exactly = 1) {
+            notificationManager.cancel(activityId, expectedNotifId)
+        }
+    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt
new file mode 100644
index 000000000..96c3e6c1f
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt
@@ -0,0 +1,92 @@
+package io.customer.messagingpush.livenotification
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import io.customer.sdk.core.network.CustomerIOHttpClient
+import io.customer.sdk.core.network.HttpMethod
+import io.customer.sdk.core.network.HttpRequestException
+import io.customer.sdk.core.network.HttpRequestParams
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.slot
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeTrue
+import org.amshove.kluent.shouldContain
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+internal class LiveNotificationLifecycleClientTest : IntegrationTest() {
+
+    private val httpClient: CustomerIOHttpClient = mockk()
+    private val client = LiveNotificationLifecycleClientImpl(httpClient)
+
+    @Test
+    fun register_buildsPutWithAndroidFcmBody() = runTest {
+        val params = slot<HttpRequestParams>()
+        coEvery { httpClient.request(capture(params)) } returns Result.success("")
+
+        val result = client.registerForActivityType(
+            activityType = "io.customer.liveactivities.deliverytracking",
+            token = "tok-1",
+            userId = "user-1"
+        )
+
+        result.isSuccess.shouldBeTrue()
+        params.captured.method shouldBeEqualTo HttpMethod.PUT
+        params.captured.path shouldBeEqualTo
+            "/v1/live_activities/registration/io.customer.liveactivities.deliverytracking"
+        val body = params.captured.body!!
+        body shouldContain "tok-1"
+        body shouldContain "\"os\":\"android\""
+        body shouldContain "\"transport\":\"fcm\""
+        body shouldContain "user-1"
+    }
+
+    @Test
+    fun reportDismissed_buildsDeleteWithEmptyBody() = runTest {
+        val params = slot<HttpRequestParams>()
+        coEvery { httpClient.request(capture(params)) } returns Result.success("")
+
+        client.reportDismissed("act-123")
+
+        params.captured.method shouldBeEqualTo HttpMethod.DELETE
+        params.captured.path shouldBeEqualTo "/v1/live_activities/act-123"
+        params.captured.body shouldBeEqualTo "{}"
+    }
+
+    @Test
+    fun send_retriesOn5xxUpToThreeAttempts() = runTest {
+        coEvery { httpClient.request(any()) } returns Result.failure(HttpRequestException(503, "boom"))
+
+        val result = client.reportDismissed("act-1")
+
+        result.isFailure.shouldBeTrue()
+        coVerify(exactly = 3) { httpClient.request(any()) }
+    }
+
+    @Test
+    fun send_doesNotRetryOn4xx() = runTest {
+        coEvery { httpClient.request(any()) } returns Result.failure(HttpRequestException(400, "bad request"))
+
+        val result = client.reportDismissed("act-1")
+
+        result.isFailure.shouldBeTrue()
+        coVerify(exactly = 1) { httpClient.request(any()) }
+    }
+
+    @Test
+    fun send_succeedsAfterTransientFailure() = runTest {
+        coEvery { httpClient.request(any()) } returnsMany listOf(
+            Result.failure(HttpRequestException(500, "x")),
+            Result.success("")
+        )
+
+        val result = client.reportDismissed("act-1")
+
+        result.isSuccess.shouldBeTrue()
+        coVerify(exactly = 2) { httpClient.request(any()) }
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationStoreTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationStoreTest.kt
new file mode 100644
index 000000000..97e750de7
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationStoreTest.kt
@@ -0,0 +1,56 @@
+package io.customer.messagingpush.livenotification
+
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+internal class LiveNotificationStoreTest : IntegrationTest() {
+
+    private val store by lazy { LiveNotificationStore(contextMock) }
+
+    @Test
+    fun registrationSignature_setGetClear() {
+        store.registrationSignature("type-a").shouldBeNull()
+
+        store.setRegistrationSignature("type-a", "tok|user")
+        store.setRegistrationSignature("type-b", "tok|user")
+
+        store.registrationSignature("type-a") shouldBeEqualTo "tok|user"
+
+        store.clearRegistrations()
+
+        store.registrationSignature("type-a").shouldBeNull()
+        store.registrationSignature("type-b").shouldBeNull()
+    }
+
+    @Test
+    fun lastTimestamp_setGetClear() {
+        store.lastTimestamp("act-1").shouldBeNull()
+
+        store.setLastTimestamp("act-1", 1_000L)
+        store.lastTimestamp("act-1") shouldBeEqualTo 1_000L
+
+        store.clearTimestamp("act-1")
+        store.lastTimestamp("act-1").shouldBeNull()
+    }
+
+    @Test
+    fun trimStaleTimestamps_removesEntriesOlderThanTtl() {
+        val now = 10_000_000_000L
+        val ttl = 1_000L
+
+        // Recorded before the cutoff -> stale.
+        store.setLastTimestamp("old", 1L, now = now - ttl - 1)
+        // Recorded within the ttl -> kept.
+        store.setLastTimestamp("fresh", 2L, now = now - 1)
+
+        store.trimStaleTimestamps(ttlMs = ttl, now = now)
+
+        store.lastTimestamp("old").shouldBeNull()
+        store.lastTimestamp("fresh") shouldBeEqualTo 2L
+    }
+}

From cce2f88c16c291b44a87e3d1c4acf54609b386f1 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Thu, 11 Jun 2026 21:40:29 +0400
Subject: [PATCH 09/10] chore(live-notifications): local start API + custom
 types + app render callback (#724)

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 messagingpush/api/messagingpush.api           | 192 +++++++++++++++++-
 .../Api36LiveNotificationBuilder.kt           |   5 +-
 .../messagingpush/BasicNotificationBuilder.kt |   4 +-
 .../messagingpush/LiveNotificationHandler.kt  | 127 ++++++++----
 .../MessagingPushModuleConfig.kt              |  27 ++-
 .../messagingpush/ModuleMessagingPushFCM.kt   |  38 +++-
 .../CustomerIOPushNotificationCallback.kt     |  25 +++
 .../messagingpush/di/DiGraphMessagingPush.kt  |   9 +
 .../livenotification/LiveNotificationData.kt  | 158 ++++++++++++++
 .../LiveNotificationLifecycleClient.kt        |  29 +++
 .../LiveNotificationManager.kt                | 102 ++++++++++
 .../LiveNotificationRegistrar.kt              |  20 +-
 .../livenotification/LiveNotificationType.kt  |  19 ++
 .../template/AuctionBidTemplate.kt            |  18 +-
 .../template/CountdownTimerTemplate.kt        |  10 +-
 .../template/DeliveryTrackingTemplate.kt      |  16 +-
 .../template/FlightStatusTemplate.kt          |  24 +--
 .../template/LiveNotificationFields.kt        |  74 +++++++
 .../template/LiveScoreTemplate.kt             |  20 +-
 .../template/TemplateRegistry.kt              |  22 +-
 .../LiveNotificationCallbackTest.kt           | 115 +++++++++++
 .../LiveNotificationHandlerTest.kt            |  65 ++++++
 .../MessagingPushModuleConfigTest.kt          |   2 +-
 .../LiveNotificationDataTest.kt               |  55 +++++
 .../LiveNotificationLifecycleClientTest.kt    |  20 ++
 .../java_layout/sdk/CustomerIORepository.java |  21 +-
 .../LiveNotificationDemoActivity.java         |  24 +++
 .../activity_live_notification_demo.xml       |   8 +
 .../src/main/res/values/strings.xml           |   1 +
 29 files changed, 1137 insertions(+), 113 deletions(-)
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationData.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationManager.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationType.kt
 create mode 100644 messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationFields.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationCallbackTest.kt
 create mode 100644 messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationDataTest.kt

diff --git a/messagingpush/api/messagingpush.api b/messagingpush/api/messagingpush.api
index d44f2e72e..42831a9f3 100644
--- a/messagingpush/api/messagingpush.api
+++ b/messagingpush/api/messagingpush.api
@@ -22,9 +22,10 @@ public final class io/customer/messagingpush/CustomerIOFirebaseMessagingService$
 
 public final class io/customer/messagingpush/MessagingPushModuleConfig : io/customer/sdk/core/module/CustomerIOModuleConfig {
 	public static final field Companion Lio/customer/messagingpush/MessagingPushModuleConfig$Companion;
-	public synthetic fun <init> (ZLio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/config/PushClickBehavior;Lio/customer/messagingpush/livenotification/LiveNotificationBranding;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (ZLio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/config/PushClickBehavior;Lio/customer/messagingpush/livenotification/LiveNotificationBranding;Ljava/util/Set;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getAutoTrackPushEvents ()Z
 	public final fun getLiveNotificationBranding ()Lio/customer/messagingpush/livenotification/LiveNotificationBranding;
+	public final fun getLiveNotificationTypes ()Ljava/util/Set;
 	public final fun getNotificationCallback ()Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;
 	public final fun getPushClickBehavior ()Lio/customer/messagingpush/config/PushClickBehavior;
 	public fun toString ()Ljava/lang/String;
@@ -36,6 +37,7 @@ public final class io/customer/messagingpush/MessagingPushModuleConfig$Builder :
 	public synthetic fun build ()Lio/customer/sdk/core/module/CustomerIOModuleConfig;
 	public final fun setAutoTrackPushEvents (Z)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 	public final fun setLiveNotificationBranding (Lio/customer/messagingpush/livenotification/LiveNotificationBranding;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
+	public final fun setLiveNotificationTypes ([Ljava/lang/String;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 	public final fun setNotificationCallback (Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 	public final fun setPushClickBehavior (Lio/customer/messagingpush/config/PushClickBehavior;)Lio/customer/messagingpush/MessagingPushModuleConfig$Builder;
 }
@@ -52,6 +54,8 @@ public final class io/customer/messagingpush/ModuleMessagingPushFCM : io/custome
 	public synthetic fun getModuleConfig ()Lio/customer/sdk/core/module/CustomerIOModuleConfig;
 	public fun getModuleName ()Ljava/lang/String;
 	public fun initialize ()V
+	public final fun startLiveNotification (Lio/customer/messagingpush/livenotification/LiveNotificationData;)Ljava/lang/String;
+	public final fun startLiveNotification (Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
 }
 
 public final class io/customer/messagingpush/ModuleMessagingPushFCM$Companion {
@@ -77,11 +81,13 @@ public final class io/customer/messagingpush/config/PushClickBehavior : java/lan
 }
 
 public abstract interface class io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback {
+	public abstract fun createLiveNotification (Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroid/content/Context;)Landroid/app/Notification;
 	public abstract fun onNotificationClicked (Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroid/content/Context;)Lkotlin/Unit;
 	public abstract fun onNotificationComposed (Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroidx/core/app/NotificationCompat$Builder;)V
 }
 
 public final class io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback$DefaultImpls {
+	public static fun createLiveNotification (Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroid/content/Context;)Landroid/app/Notification;
 	public static fun onNotificationClicked (Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroid/content/Context;)Lkotlin/Unit;
 	public static fun onNotificationComposed (Lio/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback;Lio/customer/messagingpush/data/model/CustomerIOParsedPushPayload;Landroidx/core/app/NotificationCompat$Builder;)V
 }
@@ -141,6 +147,181 @@ public final class io/customer/messagingpush/livenotification/LiveNotificationBr
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract interface class io/customer/messagingpush/livenotification/LiveNotificationData {
+	public abstract fun fields ()Ljava/util/Map;
+	public abstract fun getActivityType ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$Airport {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCity ()Ljava/lang/String;
+	public final fun getCode ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$AuctionBid : io/customer/messagingpush/livenotification/LiveNotificationData {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;ZLjava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;ZLjava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()I
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Z
+	public final fun component6 ()Ljava/lang/Long;
+	public final fun component7 ()Ljava/lang/String;
+	public final fun component8 ()Ljava/lang/String;
+	public final fun component9 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;ZLjava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/livenotification/LiveNotificationData$AuctionBid;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$AuctionBid;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;ZLjava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$AuctionBid;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun fields ()Ljava/util/Map;
+	public fun getActivityType ()Ljava/lang/String;
+	public final fun getBidCount ()I
+	public final fun getCurrencySymbol ()Ljava/lang/String;
+	public final fun getCurrentBid ()Ljava/lang/String;
+	public final fun getEndTime ()Ljava/lang/Long;
+	public final fun getItemImageKey ()Ljava/lang/String;
+	public final fun getItemTitle ()Ljava/lang/String;
+	public final fun getStatusMessage ()Ljava/lang/String;
+	public final fun getUserBidAmount ()Ljava/lang/String;
+	public fun hashCode ()I
+	public final fun isUserHighBidder ()Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$CountdownTimer : io/customer/messagingpush/livenotification/LiveNotificationData {
+	public fun <init> (Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()J
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/livenotification/LiveNotificationData$CountdownTimer;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$CountdownTimer;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$CountdownTimer;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun fields ()Ljava/util/Map;
+	public fun getActivityType ()Ljava/lang/String;
+	public final fun getExpiredMessage ()Ljava/lang/String;
+	public final fun getHeroImageKey ()Ljava/lang/String;
+	public final fun getStatusMessage ()Ljava/lang/String;
+	public final fun getTargetDate ()J
+	public final fun getTitle ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$DeliveryTracking : io/customer/messagingpush/livenotification/LiveNotificationData {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()Ljava/lang/Integer;
+	public final fun component7 ()Ljava/lang/Integer;
+	public final fun component8 ()Ljava/lang/Long;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;)Lio/customer/messagingpush/livenotification/LiveNotificationData$DeliveryTracking;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$DeliveryTracking;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Long;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$DeliveryTracking;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun fields ()Ljava/util/Map;
+	public fun getActivityType ()Ljava/lang/String;
+	public final fun getDriverName ()Ljava/lang/String;
+	public final fun getEstimatedArrival ()Ljava/lang/Long;
+	public final fun getOrderId ()Ljava/lang/String;
+	public final fun getRecipientName ()Ljava/lang/String;
+	public final fun getStatusImageKey ()Ljava/lang/String;
+	public final fun getStatusMessage ()Ljava/lang/String;
+	public final fun getStepCurrent ()Ljava/lang/Integer;
+	public final fun getStepTotal ()Ljava/lang/Integer;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$FlightStatus : io/customer/messagingpush/livenotification/LiveNotificationData {
+	public fun <init> (Ljava/lang/String;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Double;Ljava/lang/Integer;)V
+	public synthetic fun <init> (Ljava/lang/String;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Double;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component10 ()Ljava/lang/Integer;
+	public final fun component2 ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;
+	public final fun component3 ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()Ljava/lang/String;
+	public final fun component7 ()Ljava/lang/Long;
+	public final fun component8 ()Ljava/lang/Long;
+	public final fun component9 ()Ljava/lang/Double;
+	public final fun copy (Ljava/lang/String;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Double;Ljava/lang/Integer;)Lio/customer/messagingpush/livenotification/LiveNotificationData$FlightStatus;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$FlightStatus;Ljava/lang/String;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Double;Ljava/lang/Integer;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$FlightStatus;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun fields ()Ljava/util/Map;
+	public fun getActivityType ()Ljava/lang/String;
+	public final fun getDelayMinutes ()Ljava/lang/Integer;
+	public final fun getDestination ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;
+	public final fun getEstimatedArrival ()Ljava/lang/Long;
+	public final fun getFlightNumber ()Ljava/lang/String;
+	public final fun getGate ()Ljava/lang/String;
+	public final fun getOrigin ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Airport;
+	public final fun getProgressFraction ()Ljava/lang/Double;
+	public final fun getScheduledDeparture ()Ljava/lang/Long;
+	public final fun getStatusMessage ()Ljava/lang/String;
+	public final fun getTerminal ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$LiveScore : io/customer/messagingpush/livenotification/LiveNotificationData {
+	public fun <init> (Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;
+	public final fun component2 ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()I
+	public final fun component5 ()I
+	public final fun component6 ()Ljava/lang/String;
+	public final fun component7 ()Ljava/lang/String;
+	public final fun component8 ()Ljava/lang/String;
+	public final fun component9 ()Ljava/lang/String;
+	public final fun copy (Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/livenotification/LiveNotificationData$LiveScore;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$LiveScore;Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$LiveScore;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun fields ()Ljava/util/Map;
+	public fun getActivityType ()Ljava/lang/String;
+	public final fun getAwayScore ()I
+	public final fun getAwayTeam ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;
+	public final fun getClock ()Ljava/lang/String;
+	public final fun getHomeScore ()I
+	public final fun getHomeTeam ()Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;
+	public final fun getLeagueLogoKey ()Ljava/lang/String;
+	public final fun getPeriod ()Ljava/lang/String;
+	public final fun getSport ()Ljava/lang/String;
+	public final fun getStatusMessage ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class io/customer/messagingpush/livenotification/LiveNotificationData$Team {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;
+	public static synthetic fun copy$default (Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lio/customer/messagingpush/livenotification/LiveNotificationData$Team;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getLogoKey ()Ljava/lang/String;
+	public final fun getName ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver : android/content/BroadcastReceiver {
 	public static final field Companion Lio/customer/messagingpush/livenotification/LiveNotificationDismissReceiver$Companion;
 	public static final field EXTRA_ACTIVITY_ID Ljava/lang/String;
@@ -151,6 +332,15 @@ public final class io/customer/messagingpush/livenotification/LiveNotificationDi
 public final class io/customer/messagingpush/livenotification/LiveNotificationDismissReceiver$Companion {
 }
 
+public final class io/customer/messagingpush/livenotification/LiveNotificationType {
+	public static final field AUCTION_BID Ljava/lang/String;
+	public static final field COUNTDOWN_TIMER Ljava/lang/String;
+	public static final field DELIVERY_TRACKING Ljava/lang/String;
+	public static final field FLIGHT_STATUS Ljava/lang/String;
+	public static final field INSTANCE Lio/customer/messagingpush/livenotification/LiveNotificationType;
+	public static final field LIVE_SCORE Ljava/lang/String;
+}
+
 public final class io/customer/messagingpush/processor/PushMessageProcessor$Companion {
 	public static final field RECENT_MESSAGES_MAX_SIZE I
 	public final fun getRecentMessagesQueue ()Ljava/util/concurrent/LinkedBlockingDeque;
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
index f3c3d726a..479d8bad0 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/Api36LiveNotificationBuilder.kt
@@ -124,7 +124,10 @@ internal object Api36LiveNotificationBuilder {
             builder.style = Notification.BigTextStyle().bigText(params.body)
         }
 
-        params.countdownUntil?.let { until ->
+        // Only start a count-down chronometer to a future instant. A stale/past target
+        // (e.g. an estimatedArrival that has already elapsed) would render as an
+        // already-expired live update and the system may suppress the notification entirely.
+        params.countdownUntil?.takeIf { it > System.currentTimeMillis() }?.let { until ->
             builder.setWhen(until)
             builder.setUsesChronometer(true)
             builder.setChronometerCountDown(true)
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
index 42ecda66e..5402e5df2 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/BasicNotificationBuilder.kt
@@ -70,7 +70,9 @@ internal object BasicNotificationBuilder {
             builder.setProgress(params.progressMax, safeProgress, false)
         }
 
-        params.countdownUntil?.let { until ->
+        // Only count down to a future instant; a past target renders as an already-expired
+        // chronometer and can suppress the notification (see Api36LiveNotificationBuilder).
+        params.countdownUntil?.takeIf { it > System.currentTimeMillis() }?.let { until ->
             builder.setWhen(until)
             builder.setUsesChronometer(true)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
index 338658d47..f6b65482e 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/LiveNotificationHandler.kt
@@ -1,5 +1,6 @@
 package io.customer.messagingpush
 
+import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
@@ -20,8 +21,10 @@ import io.customer.messagingpush.livenotification.LiveNotificationBranding
 import io.customer.messagingpush.livenotification.LiveNotificationDismissReceiver
 import io.customer.messagingpush.livenotification.template.TemplateAssets
 import io.customer.messagingpush.livenotification.template.TemplateRegistry
+import io.customer.messagingpush.livenotification.template.TemplateRenderResult
 import io.customer.messagingpush.util.PushTrackingUtil
 import io.customer.sdk.core.di.SDKComponent
+import java.util.concurrent.ConcurrentHashMap
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
@@ -70,6 +73,11 @@ internal class LiveNotificationHandler(
             PushTrackingUtil.DELIVERY_ID_KEY,
             PushTrackingUtil.DELIVERY_TOKEN_KEY
         )
+
+        // Pending `end` dismissals, keyed by activity_id, so a new event for the same
+        // activity can cancel a scheduled removal (e.g. when an activity_id is reused).
+        private val dismissalHandler = Handler(Looper.getMainLooper())
+        private val pendingDismissals = ConcurrentHashMap<String, Runnable>()
     }
 
     fun handle(
@@ -100,12 +108,23 @@ internal class LiveNotificationHandler(
             return
         }
 
-        // Out-of-order / duplicate guard. Android renders FCM data directly, so unlike
-        // iOS (where APNs/ActivityKit order updates) the SDK must drop stale pushes itself.
+        // Live notifications are opt-in: only handle activity types the host app enabled.
+        val activityType = bundle.getString(ACTIVITY_TYPE_KEY)
+        if (activityType == null || activityType !in SDKComponent.pushModuleConfig.liveNotificationTypes) {
+            SDKComponent.logger.debug(
+                "Live notification type '$activityType' is not enabled; ignoring activity '$activityId'."
+            )
+            return
+        }
+        val isEnd = event == EVENT_END
+
+        // Out-of-order / duplicate guard. Android renders FCM data directly, so unlike iOS
+        // (where APNs/ActivityKit order updates) the SDK must drop stale pushes itself. `end`
+        // is terminal and bypasses the guard so a stale `end` still cancels the notification.
         val store = SDKComponent.liveNotificationStore
         val timestamp = bundle.getString(TIMESTAMP_KEY)?.toLongOrNull()
-        if (timestamp != null) {
-            val lastSeen = store.lastTimestamp(activityId)
+        val lastSeen = store.lastTimestamp(activityId)
+        if (!isEnd && timestamp != null) {
             if (lastSeen != null && timestamp <= lastSeen) {
                 SDKComponent.logger.debug(
                     "Dropping out-of-order/duplicate live notification for '$activityId' (timestamp $timestamp <= $lastSeen)."
@@ -114,26 +133,24 @@ internal class LiveNotificationHandler(
             }
         }
 
-        val activityType = bundle.getString(ACTIVITY_TYPE_KEY)
-        val template = TemplateRegistry.find(activityType)
-        if (template == null) {
-            SDKComponent.logger.error(
-                "Unknown live notification template '$activityType'; dropping push for activity '$activityId'."
-            )
-            return
-        }
+        // A new event for this activity supersedes any scheduled end-dismissal (handles
+        // activity_id reuse where the delayed cancel would otherwise kill the new notification).
+        cancelPendingDismissal(activityId)
 
-        // We have committed to acting on this push: record its timestamp so later,
-        // out-of-order pushes for the same activity are dropped. `end` clears it below.
-        if (event != EVENT_END && timestamp != null) {
+        // Advance the high-water timestamp for ALL events (incl. `end`) so a later stale
+        // update — even one arriving after `end` — is dropped by the guard above. Only ever
+        // move it forward: a stale, out-of-order `end` (which bypasses the guard) must not
+        // lower the mark, or a later stale update could slip through and resurrect the activity.
+        if (timestamp != null && (lastSeen == null || timestamp > lastSeen)) {
             store.setLastTimestamp(activityId, timestamp)
         }
 
+        val template = TemplateRegistry.find(activityType)
         val data = extractData(bundle)
         val branding = SDKComponent.pushModuleConfig.liveNotificationBranding
         val effectiveSmallIcon = resolveSmallIcon(context, branding, smallIcon)
 
-        val result = template.render(
+        val result = template?.render(
             context = context,
             data = data,
             branding = branding,
@@ -143,7 +160,7 @@ internal class LiveNotificationHandler(
 
         val notifId = activityId.hashCode() and 0x7FFFFFFF
 
-        if (result.cancelImmediately) {
+        if (result?.cancelImmediately == true) {
             notificationManager.cancel(activityId, notifId)
             return
         }
@@ -151,19 +168,52 @@ internal class LiveNotificationHandler(
         bundle.putInt(CustomerIOPushNotificationHandler.NOTIFICATION_REQUEST_CODE, notifId)
         val parsedPayload = CustomerIOParsedPushPayload(
             extras = Bundle(bundle),
-            deepLink = result.deepLink ?: bundle.getString(CustomerIOPushNotificationHandler.DEEP_LINK_KEY),
+            deepLink = result?.deepLink ?: bundle.getString(CustomerIOPushNotificationHandler.DEEP_LINK_KEY),
             cioDeliveryId = deliveryId,
             cioDeliveryToken = deliveryToken,
-            title = result.title,
-            body = result.body,
+            title = result?.title ?: bundle.getString(CustomerIOPushNotificationHandler.TITLE_KEY).orEmpty(),
+            body = result?.body ?: bundle.getString(CustomerIOPushNotificationHandler.BODY_KEY).orEmpty(),
             activityId = activityId
         )
         val pendingIntent = createIntentForNotificationClick(context, notifId, parsedPayload)
         val deletePendingIntent = createDeleteIntent(context, notifId, activityId)
 
-        val notification = when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> {
-                val params = Api36LiveNotificationParams(
+        // The host app may fully render the notification; otherwise fall back to the
+        // SDK template. Custom (template-less) types must be rendered by the callback.
+        val appNotification = SDKComponent.pushModuleConfig.notificationCallback
+            ?.createLiveNotification(parsedPayload, context)
+        val notification = appNotification ?: result?.let {
+            buildSdkNotification(context, channelId, effectiveSmallIcon, it, pendingIntent, deletePendingIntent)
+        }
+
+        when {
+            notification != null -> notificationManager.notify(activityId, notifId, notification)
+            // An `end` with no renderer still falls through to cancel the existing notification.
+            !isEnd -> {
+                SDKComponent.logger.error(
+                    "No renderer for live notification type '$activityType': no built-in template and " +
+                        "createLiveNotification returned null; dropping activity '$activityId'."
+                )
+                return
+            }
+        }
+
+        if (isEnd) {
+            scheduleEndDismissal(bundle, notificationManager, activityId, notifId)
+        }
+    }
+
+    private fun buildSdkNotification(
+        context: Context,
+        channelId: String,
+        @DrawableRes effectiveSmallIcon: Int,
+        result: TemplateRenderResult,
+        pendingIntent: PendingIntent,
+        deletePendingIntent: PendingIntent
+    ): Notification = when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> {
+            Api36LiveNotificationBuilder.build(
+                Api36LiveNotificationParams(
                     context = context,
                     channelId = channelId,
                     title = result.title,
@@ -184,10 +234,11 @@ internal class LiveNotificationHandler(
                     largeIcon = result.largeIcon,
                     showProgress = result.showProgress
                 )
-                Api36LiveNotificationBuilder.build(params)
-            }
-            else -> {
-                val params = BasicNotificationParams(
+            )
+        }
+        else -> {
+            BasicNotificationBuilder.build(
+                BasicNotificationParams(
                     context = context,
                     channelId = channelId,
                     title = result.title,
@@ -204,15 +255,7 @@ internal class LiveNotificationHandler(
                     largeIcon = result.largeIcon,
                     showProgress = result.showProgress
                 )
-                BasicNotificationBuilder.build(params)
-            }
-        }
-
-        notificationManager.notify(activityId, notifId, notification)
-
-        if (event == EVENT_END) {
-            store.clearTimestamp(activityId)
-            scheduleEndDismissal(bundle, notificationManager, activityId, notifId)
+            )
         }
     }
 
@@ -234,9 +277,17 @@ internal class LiveNotificationHandler(
             return
         }
         val delayMs = (dismissAtMs - System.currentTimeMillis()).coerceAtLeast(0L)
-        Handler(Looper.getMainLooper()).postDelayed({
+        val task = Runnable {
             notificationManager.cancel(activityId, notifId)
-        }, delayMs)
+            pendingDismissals.remove(activityId)
+        }
+        pendingDismissals[activityId] = task
+        dismissalHandler.postDelayed(task, delayMs)
+    }
+
+    /** Cancels a scheduled end-dismissal for [activityId], if any. */
+    private fun cancelPendingDismissal(activityId: String) {
+        pendingDismissals.remove(activityId)?.let { dismissalHandler.removeCallbacks(it) }
     }
 
     private fun createDeleteIntent(
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt b/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt
index fedf0aa93..c538dbb9e 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/MessagingPushModuleConfig.kt
@@ -20,13 +20,15 @@ class MessagingPushModuleConfig private constructor(
     val autoTrackPushEvents: Boolean,
     val notificationCallback: CustomerIOPushNotificationCallback?,
     val pushClickBehavior: PushClickBehavior,
-    val liveNotificationBranding: LiveNotificationBranding?
+    val liveNotificationBranding: LiveNotificationBranding?,
+    val liveNotificationTypes: Set<String>
 ) : CustomerIOModuleConfig {
     class Builder : CustomerIOModuleConfig.Builder<MessagingPushModuleConfig> {
         private var autoTrackPushEvents: Boolean = true
         private var notificationCallback: CustomerIOPushNotificationCallback? = null
         private var pushClickBehavior: PushClickBehavior = ACTIVITY_PREVENT_RESTART
         private var liveNotificationBranding: LiveNotificationBranding? = null
+        private var liveNotificationTypes: Set<String> = emptySet()
 
         /**
          * Allows to enable/disable automatic tracking of push events. Auto tracking will generate
@@ -71,18 +73,37 @@ class MessagingPushModuleConfig private constructor(
             return this
         }
 
+        /**
+         * Enables live notifications for the given activity types. **This is
+         * required to use live notifications** — until at least one type is
+         * enabled the feature is a no-op (nothing is registered with Customer.io
+         * and pushes for non-enabled types are ignored).
+         *
+         * Pass built-in types from [io.customer.messagingpush.livenotification.LiveNotificationType]
+         * (rendered by the SDK's templates) and/or your own custom type strings
+         * (rendered by [CustomerIOPushNotificationCallback.createLiveNotification],
+         * which must be provided for custom types).
+         *
+         * @param types reverse-DNS activity type identifiers to enable.
+         */
+        fun setLiveNotificationTypes(vararg types: String): Builder {
+            this.liveNotificationTypes = types.toSet()
+            return this
+        }
+
         override fun build(): MessagingPushModuleConfig {
             return MessagingPushModuleConfig(
                 autoTrackPushEvents = autoTrackPushEvents,
                 notificationCallback = notificationCallback,
                 pushClickBehavior = pushClickBehavior,
-                liveNotificationBranding = liveNotificationBranding
+                liveNotificationBranding = liveNotificationBranding,
+                liveNotificationTypes = liveNotificationTypes
             )
         }
     }
 
     override fun toString(): String {
-        return "MessagingPushModuleConfig(autoTrackPushEvents=$autoTrackPushEvents, notificationCallback=$notificationCallback, pushClickBehavior=$pushClickBehavior, liveNotificationBranding=$liveNotificationBranding)"
+        return "MessagingPushModuleConfig(autoTrackPushEvents=$autoTrackPushEvents, notificationCallback=$notificationCallback, pushClickBehavior=$pushClickBehavior, liveNotificationBranding=$liveNotificationBranding, liveNotificationTypes=$liveNotificationTypes)"
     }
 
     companion object {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt b/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
index 18e6371ed..58168befe 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/ModuleMessagingPushFCM.kt
@@ -9,10 +9,12 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.WorkManager
 import androidx.work.await
 import io.customer.messagingpush.di.fcmTokenProvider
+import io.customer.messagingpush.di.liveNotificationManager
 import io.customer.messagingpush.di.liveNotificationRegistrar
 import io.customer.messagingpush.di.pendingPushDeliveryStore
 import io.customer.messagingpush.di.pushLogger
 import io.customer.messagingpush.di.pushTrackingUtil
+import io.customer.messagingpush.livenotification.LiveNotificationData
 import io.customer.messagingpush.logger.PushNotificationLogger
 import io.customer.messagingpush.provider.DeviceTokenProvider
 import io.customer.messagingpush.store.PendingPushDeliveryMetric
@@ -24,6 +26,7 @@ import io.customer.sdk.core.module.CustomerIOModule
 import io.customer.sdk.core.util.DispatchersProvider
 import io.customer.sdk.data.store.PendingDeliveryStore
 import io.customer.sdk.events.Metric
+import java.util.UUID
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
@@ -49,14 +52,43 @@ class ModuleMessagingPushFCM @JvmOverloads constructor(
         get() = MODULE_NAME
 
     override fun initialize() {
-        // Start before requesting the token so the registrar observes the resulting
-        // RegisterDeviceTokenEvent and registers the built-in live-notification types.
-        SDKComponent.liveNotificationRegistrar.start()
+        // Live notifications are opt-in: only wire up registration when the host app
+        // enabled at least one activity type. Start before requesting the token so the
+        // registrar observes the resulting RegisterDeviceTokenEvent.
+        if (moduleConfig.liveNotificationTypes.isNotEmpty()) {
+            SDKComponent.liveNotificationRegistrar.start()
+        }
         getCurrentFcmToken()
         subscribeToLifecycleEvents()
         observeProcessForeground()
     }
 
+    /**
+     * Starts a live notification locally for a built-in template type. The SDK
+     * generates a unique activity id, renders the notification immediately, and
+     * registers the instance with Customer.io so the backend can push updates.
+     *
+     * @return the generated `activity_id`, used to correlate subsequent updates.
+     */
+    fun startLiveNotification(data: LiveNotificationData): String =
+        startLiveNotification(data.activityType, data.fields())
+
+    /**
+     * Starts a live notification locally for a customer-defined [activityType]
+     * (one registered via [MessagingPushModuleConfig.Builder.registerLiveNotificationTypes]).
+     * Custom types have no built-in template, so a
+     * [io.customer.messagingpush.data.communication.CustomerIOPushNotificationCallback.createLiveNotification]
+     * must render them.
+     *
+     * @param data flattened fields delivered to the renderer.
+     * @return the generated `activity_id`.
+     */
+    fun startLiveNotification(activityType: String, data: Map<String, Any?>): String {
+        val activityId = UUID.randomUUID().toString()
+        SDKComponent.liveNotificationManager.start(activityId, activityType, data)
+        return activityId
+    }
+
     private fun subscribeToLifecycleEvents() {
         activityLifecycleCallbacks.subscribe { events ->
             events
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback.kt b/messagingpush/src/main/java/io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback.kt
index e0767b6af..1f92caeac 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/data/communication/CustomerIOPushNotificationCallback.kt
@@ -1,5 +1,6 @@
 package io.customer.messagingpush.data.communication
 
+import android.app.Notification
 import android.content.Context
 import androidx.core.app.NotificationCompat
 import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
@@ -42,4 +43,28 @@ interface CustomerIOPushNotificationCallback {
         payload: CustomerIOParsedPushPayload,
         builder: NotificationCompat.Builder
     ) = Unit
+
+    /**
+     * Called for live notifications to let the host app render the notification
+     * itself. Return a fully-built [Notification] to take complete control of
+     * its appearance and intents, or null to use the SDK's built-in template.
+     *
+     * Required for customer-defined activity types (registered via
+     * [io.customer.messagingpush.MessagingPushModuleConfig.Builder.registerLiveNotificationTypes]),
+     * which have no built-in template; if this returns null for such a type, the
+     * notification is dropped.
+     *
+     * The SDK still owns the posting lifecycle: it posts the returned
+     * notification keyed by `activity_id` (so later updates replace it) and
+     * cancels it on `end`. It does NOT modify the returned notification, so any
+     * dismissal reporting is the app's responsibility.
+     *
+     * @param payload parsed live-notification payload (activity id + flattened
+     * fields in [CustomerIOParsedPushPayload.extras]).
+     * @param context reference to application context.
+     */
+    fun createLiveNotification(
+        payload: CustomerIOParsedPushPayload,
+        context: Context
+    ): Notification? = null
 }
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt b/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
index 5382adadf..cddb98da6 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
@@ -12,6 +12,7 @@ import io.customer.messagingpush.PushDeliveryTracker
 import io.customer.messagingpush.PushDeliveryTrackerImpl
 import io.customer.messagingpush.livenotification.LiveNotificationLifecycleClient
 import io.customer.messagingpush.livenotification.LiveNotificationLifecycleClientImpl
+import io.customer.messagingpush.livenotification.LiveNotificationManager
 import io.customer.messagingpush.livenotification.LiveNotificationRegistrar
 import io.customer.messagingpush.livenotification.LiveNotificationStore
 import io.customer.messagingpush.logger.PushNotificationLogger
@@ -101,6 +102,14 @@ internal val SDKComponent.liveNotificationRegistrar: LiveNotificationRegistrar
         LiveNotificationRegistrar(liveNotificationLifecycleClient, liveNotificationStore)
     }
 
+internal val SDKComponent.liveNotificationManager: LiveNotificationManager
+    get() = singleton<LiveNotificationManager> {
+        LiveNotificationManager(
+            lifecycleClient = liveNotificationLifecycleClient,
+            registrar = liveNotificationRegistrar
+        )
+    }
+
 internal val SDKComponent.pushDeliveryTracker: PushDeliveryTracker
     get() = singleton<PushDeliveryTracker> { PushDeliveryTrackerImpl() }
 
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationData.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationData.kt
new file mode 100644
index 000000000..a0164d970
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationData.kt
@@ -0,0 +1,158 @@
+package io.customer.messagingpush.livenotification
+
+import io.customer.messagingpush.livenotification.template.AirportFields
+import io.customer.messagingpush.livenotification.template.AuctionBidFields
+import io.customer.messagingpush.livenotification.template.CountdownTimerFields
+import io.customer.messagingpush.livenotification.template.DeliveryTrackingFields
+import io.customer.messagingpush.livenotification.template.FlightStatusFields
+import io.customer.messagingpush.livenotification.template.LiveScoreFields
+import io.customer.messagingpush.livenotification.template.TeamFields
+import org.json.JSONObject
+
+/**
+ * Typed payload for starting a built-in live notification locally via
+ * `ModuleMessagingPushFCM.startLiveNotification`. Each subtype knows its
+ * [activityType] and flattens itself into the envelope fields the templates
+ * read (the same flattened shape the backend delivers). Field names come from
+ * the shared `*Fields` constants so local-start and push-render stay in sync.
+ *
+ * For customer-defined activity types, use the `Map` overload of
+ * `startLiveNotification` instead.
+ */
+sealed interface LiveNotificationData {
+    val activityType: String
+
+    /** Flattened template fields; null values are omitted by the caller. */
+    fun fields(): Map<String, Any?>
+
+    data class DeliveryTracking(
+        val orderId: String,
+        val statusMessage: String,
+        val recipientName: String? = null,
+        val driverName: String? = null,
+        val statusImageKey: String? = null,
+        val stepCurrent: Int? = null,
+        val stepTotal: Int? = null,
+        val estimatedArrival: Long? = null
+    ) : LiveNotificationData {
+        override val activityType = LiveNotificationType.DELIVERY_TRACKING
+        override fun fields() = mapOf(
+            DeliveryTrackingFields.ORDER_ID to orderId,
+            DeliveryTrackingFields.STATUS_MESSAGE to statusMessage,
+            DeliveryTrackingFields.RECIPIENT_NAME to recipientName,
+            DeliveryTrackingFields.DRIVER_NAME to driverName,
+            DeliveryTrackingFields.STATUS_IMAGE_KEY to statusImageKey,
+            DeliveryTrackingFields.STEP_CURRENT to stepCurrent,
+            DeliveryTrackingFields.STEP_TOTAL to stepTotal,
+            DeliveryTrackingFields.ESTIMATED_ARRIVAL to estimatedArrival
+        )
+    }
+
+    data class FlightStatus(
+        val flightNumber: String,
+        val origin: Airport,
+        val destination: Airport,
+        val statusMessage: String,
+        val gate: String? = null,
+        val terminal: String? = null,
+        val scheduledDeparture: Long? = null,
+        val estimatedArrival: Long? = null,
+        val progressFraction: Double? = null,
+        val delayMinutes: Int? = null
+    ) : LiveNotificationData {
+        override val activityType = LiveNotificationType.FLIGHT_STATUS
+        override fun fields() = mapOf(
+            FlightStatusFields.FLIGHT_NUMBER to flightNumber,
+            FlightStatusFields.ORIGIN to origin.toJson(),
+            FlightStatusFields.DESTINATION to destination.toJson(),
+            FlightStatusFields.STATUS_MESSAGE to statusMessage,
+            FlightStatusFields.GATE to gate,
+            FlightStatusFields.TERMINAL to terminal,
+            FlightStatusFields.SCHEDULED_DEPARTURE to scheduledDeparture,
+            FlightStatusFields.ESTIMATED_ARRIVAL to estimatedArrival,
+            FlightStatusFields.PROGRESS_FRACTION to progressFraction,
+            FlightStatusFields.DELAY_MINUTES to delayMinutes
+        )
+    }
+
+    data class LiveScore(
+        val homeTeam: Team,
+        val awayTeam: Team,
+        val period: String,
+        val homeScore: Int = 0,
+        val awayScore: Int = 0,
+        val clock: String? = null,
+        val statusMessage: String? = null,
+        val sport: String? = null,
+        val leagueLogoKey: String? = null
+    ) : LiveNotificationData {
+        override val activityType = LiveNotificationType.LIVE_SCORE
+        override fun fields() = mapOf(
+            LiveScoreFields.HOME_TEAM to homeTeam.toJson(),
+            LiveScoreFields.AWAY_TEAM to awayTeam.toJson(),
+            LiveScoreFields.PERIOD to period,
+            LiveScoreFields.HOME_SCORE to homeScore,
+            LiveScoreFields.AWAY_SCORE to awayScore,
+            LiveScoreFields.CLOCK to clock,
+            LiveScoreFields.STATUS_MESSAGE to statusMessage,
+            LiveScoreFields.SPORT to sport,
+            LiveScoreFields.LEAGUE_LOGO_KEY to leagueLogoKey
+        )
+    }
+
+    data class CountdownTimer(
+        val title: String,
+        val targetDate: Long,
+        val statusMessage: String,
+        val expiredMessage: String? = null,
+        val heroImageKey: String? = null
+    ) : LiveNotificationData {
+        override val activityType = LiveNotificationType.COUNTDOWN_TIMER
+        override fun fields() = mapOf(
+            CountdownTimerFields.TITLE to title,
+            CountdownTimerFields.TARGET_DATE to targetDate,
+            CountdownTimerFields.STATUS_MESSAGE to statusMessage,
+            CountdownTimerFields.EXPIRED_MESSAGE to expiredMessage,
+            CountdownTimerFields.HERO_IMAGE_KEY to heroImageKey
+        )
+    }
+
+    data class AuctionBid(
+        val itemTitle: String,
+        val currentBid: String,
+        val bidCount: Int,
+        val statusMessage: String,
+        val isUserHighBidder: Boolean,
+        val endTime: Long? = null,
+        val userBidAmount: String? = null,
+        val itemImageKey: String? = null,
+        val currencySymbol: String? = null
+    ) : LiveNotificationData {
+        override val activityType = LiveNotificationType.AUCTION_BID
+        override fun fields() = mapOf(
+            AuctionBidFields.ITEM_TITLE to itemTitle,
+            AuctionBidFields.CURRENT_BID to currentBid,
+            AuctionBidFields.BID_COUNT to bidCount,
+            AuctionBidFields.STATUS_MESSAGE to statusMessage,
+            AuctionBidFields.IS_USER_HIGH_BIDDER to isUserHighBidder,
+            AuctionBidFields.END_TIME to endTime,
+            AuctionBidFields.USER_BID_AMOUNT to userBidAmount,
+            AuctionBidFields.ITEM_IMAGE_KEY to itemImageKey,
+            AuctionBidFields.CURRENCY_SYMBOL to currencySymbol
+        )
+    }
+
+    /** Airport endpoint for [FlightStatus]. */
+    data class Airport(val code: String, val city: String? = null) {
+        internal fun toJson(): JSONObject = JSONObject().put(AirportFields.CODE, code).apply {
+            city?.let { put(AirportFields.CITY, it) }
+        }
+    }
+
+    /** Team for [LiveScore]. */
+    data class Team(val name: String, val logoKey: String? = null) {
+        internal fun toJson(): JSONObject = JSONObject().put(TeamFields.NAME, name).apply {
+            logoKey?.let { put(TeamFields.LOGO_KEY, it) }
+        }
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt
index 206798377..e9aecffb0 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClient.kt
@@ -21,6 +21,12 @@ import org.json.JSONObject
 internal interface LiveNotificationLifecycleClient {
     suspend fun registerForActivityType(activityType: String, token: String, userId: String): Result<Unit>
 
+    /**
+     * Registers a specific locally-started activity instance so the backend can
+     * push updates to it.
+     */
+    suspend fun registerInstance(activityId: String, activityType: String, token: String, userId: String): Result<Unit>
+
     suspend fun reportDismissed(activityId: String): Result<Unit>
 }
 
@@ -49,6 +55,29 @@ internal class LiveNotificationLifecycleClientImpl(
         )
     }
 
+    override suspend fun registerInstance(
+        activityId: String,
+        activityType: String,
+        token: String,
+        userId: String
+    ): Result<Unit> {
+        val body = JSONObject().apply {
+            put("token", token)
+            put("activity_type", activityType)
+            put("os", OS_ANDROID)
+            put("transport", TRANSPORT_FCM)
+            put("userId", userId)
+        }
+        return send(
+            HttpRequestParams(
+                path = "/v1/live_activities/$activityId/push_token",
+                method = HttpMethod.PUT,
+                headers = JSON_HEADERS,
+                body = body.toString()
+            )
+        )
+    }
+
     override suspend fun reportDismissed(activityId: String): Result<Unit> {
         return send(
             HttpRequestParams(
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationManager.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationManager.kt
new file mode 100644
index 000000000..73be3bfcd
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationManager.kt
@@ -0,0 +1,102 @@
+package io.customer.messagingpush.livenotification
+
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Bundle
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import io.customer.messagingpush.LiveNotificationHandler
+import io.customer.messagingpush.extensions.getColorOrNull
+import io.customer.messagingpush.extensions.getMetaDataResource
+import io.customer.messagingpush.util.NotificationChannelCreator
+import io.customer.sdk.core.di.SDKComponent
+import io.customer.sdk.core.extensions.applicationMetaData
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+/**
+ * Starts a live notification locally on behalf of the host app: renders it
+ * immediately through the normal templating path, then registers the instance
+ * with the backend so Customer.io can push subsequent updates to it.
+ *
+ * Rendering goes straight through [LiveNotificationHandler] (not the FCM
+ * delivery path), so no delivered/opened metric is fabricated for a
+ * locally-started notification.
+ */
+internal class LiveNotificationManager(
+    private val lifecycleClient: LiveNotificationLifecycleClient,
+    private val registrar: LiveNotificationRegistrar,
+    private val notificationChannelCreator: NotificationChannelCreator = NotificationChannelCreator()
+) {
+    private val context: Context
+        get() = SDKComponent.android().applicationContext
+
+    fun start(activityId: String, activityType: String, fields: Map<String, Any?>) {
+        renderLocally(buildBundle(activityId, activityType, fields))
+        registerInstance(activityId, activityType)
+    }
+
+    private fun buildBundle(activityId: String, activityType: String, fields: Map<String, Any?>): Bundle =
+        Bundle().apply {
+            // Write template fields first so the reserved envelope keys below always
+            // win if a field key collides with one (e.g. a field named "timestamp").
+            for ((key, value) in fields) {
+                if (value != null) putString(key, value.toString())
+            }
+            putString(LiveNotificationHandler.ACTIVITY_ID_KEY, activityId)
+            putString(LiveNotificationHandler.EVENT_KEY, EVENT_START)
+            putString(LiveNotificationHandler.ACTIVITY_TYPE_KEY, activityType)
+            putString(LiveNotificationHandler.TIMESTAMP_KEY, System.currentTimeMillis().toString())
+        }
+
+    private fun renderLocally(bundle: Bundle) {
+        val ctx = context
+        val appMetaData = ctx.applicationMetaData()
+        val applicationName = ctx.applicationInfo.loadLabel(ctx.packageManager).toString()
+
+        @DrawableRes
+        val smallIcon = appMetaData?.getMetaDataResource(FCM_DEFAULT_ICON) ?: ctx.applicationInfo.icon
+
+        @ColorInt
+        val tintColor = appMetaData?.getMetaDataResource(FCM_DEFAULT_COLOR)?.let { ctx.getColorOrNull(it) }
+
+        val notificationManager = ctx.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val channelId = notificationChannelCreator.createLiveNotificationChannelIfNeededAndReturnChannelId(
+            context = ctx,
+            applicationName = applicationName,
+            appMetaData = appMetaData,
+            notificationManager = notificationManager
+        )
+
+        LiveNotificationHandler(bundle).handle(
+            context = ctx,
+            deliveryId = "",
+            deliveryToken = "",
+            smallIcon = smallIcon,
+            tintColor = tintColor,
+            channelId = channelId,
+            notificationManager = notificationManager
+        )
+    }
+
+    private fun registerInstance(activityId: String, activityType: String) {
+        // Reuse the token the registrar already tracks (fetched once in ModuleMessagingPushFCM)
+        // instead of requesting it again.
+        val token = registrar.currentToken()
+        if (token == null) {
+            SDKComponent.logger.debug(
+                "No FCM token available yet; skipping instance registration for live notification '$activityId'."
+            )
+            return
+        }
+        CoroutineScope(SDKComponent.dispatchersProvider.background).launch {
+            lifecycleClient.registerInstance(activityId, activityType, token, registrar.currentUserId())
+        }
+    }
+
+    companion object {
+        private const val EVENT_START = "start"
+        private const val FCM_DEFAULT_ICON = "com.google.firebase.messaging.default_notification_icon"
+        private const val FCM_DEFAULT_COLOR = "com.google.firebase.messaging.default_notification_color"
+    }
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt
index c9d0f496d..664e8f54b 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationRegistrar.kt
@@ -1,14 +1,15 @@
 package io.customer.messagingpush.livenotification
 
-import io.customer.messagingpush.livenotification.template.TemplateRegistry
+import io.customer.messagingpush.di.pushModuleConfig
 import io.customer.sdk.communication.Event
 import io.customer.sdk.core.di.SDKComponent
 import io.customer.sdk.core.di.SDKComponent.eventBus
 
 /**
- * Registers the device's FCM token with the backend for each built-in
- * live-notification template type — the Android analogue of iOS push-to-start
- * registration — and keeps it current.
+ * Registers the device's FCM token with the backend for the live-notification
+ * activity types the host app enabled via
+ * `MessagingPushModuleConfig.setLiveNotificationTypes` (the Android analogue of
+ * iOS push-to-start registration). No types enabled ⇒ nothing is registered.
  *
  * Registration is (re)attempted whenever the device token rotates
  * ([Event.RegisterDeviceTokenEvent]) or the user changes
@@ -27,6 +28,15 @@ internal class LiveNotificationRegistrar(
     @Volatile
     private var userId: String = ""
 
+    /** The current FCM token, or null if not yet received. */
+    fun currentToken(): String? = token
+
+    /** The current resolved user identity (identified userId, else anonymousId). */
+    fun currentUserId(): String = userId
+
+    private val enabledTypes: Set<String>
+        get() = SDKComponent.pushModuleConfig.liveNotificationTypes
+
     fun start() {
         // Drop dedup entries for activities that ended long ago without an explicit `end`.
         store.trimStaleTimestamps()
@@ -51,7 +61,7 @@ internal class LiveNotificationRegistrar(
     private suspend fun registerAll() {
         val currentToken = token ?: return
         val signature = "$currentToken|$userId"
-        for (activityType in TemplateRegistry.builtInTypes) {
+        for (activityType in enabledTypes) {
             if (store.registrationSignature(activityType) == signature) continue
             val result = client.registerForActivityType(activityType, currentToken, userId)
             if (result.isSuccess) {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationType.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationType.kt
new file mode 100644
index 000000000..734691352
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/LiveNotificationType.kt
@@ -0,0 +1,19 @@
+package io.customer.messagingpush.livenotification
+
+/**
+ * Built-in live-notification activity type identifiers (reverse-DNS, matching
+ * the iOS Live Activity identifiers).
+ *
+ * Pass these — and/or your own custom type strings — to
+ * [io.customer.messagingpush.MessagingPushModuleConfig.Builder.setLiveNotificationTypes]
+ * to enable live notifications. The feature is a no-op until at least one type
+ * is enabled: nothing is registered with the backend and pushes for
+ * non-enabled types are ignored.
+ */
+object LiveNotificationType {
+    const val DELIVERY_TRACKING = "io.customer.liveactivities.deliverytracking"
+    const val FLIGHT_STATUS = "io.customer.liveactivities.flightstatus"
+    const val LIVE_SCORE = "io.customer.liveactivities.livescore"
+    const val COUNTDOWN_TIMER = "io.customer.liveactivities.countdowntimer"
+    const val AUCTION_BID = "io.customer.liveactivities.auctionbid"
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
index d8ffab030..579f99cf3 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/AuctionBidTemplate.kt
@@ -29,15 +29,15 @@ internal object AuctionBidTemplate : LiveNotificationTemplate {
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val itemTitle = data.optString("itemTitle")
-        val itemImageKey = data.optStringNonEmpty("itemImageKey")
-        val currencySymbol = data.optStringNonEmpty("currencySymbol") ?: "$"
-        val currentBid = data.optString("currentBid")
-        val bidCount = data.optInt("bidCount", 0)
-        val endTime = data.optLong("endTime").takeIf { it > 0 }
-        val statusMessage = data.optString("statusMessage")
-        val isUserHighBidder = data.optBoolean("isUserHighBidder", false)
-        val userBidAmount = data.optStringNonEmpty("userBidAmount")
+        val itemTitle = data.optString(AuctionBidFields.ITEM_TITLE)
+        val itemImageKey = data.optStringNonEmpty(AuctionBidFields.ITEM_IMAGE_KEY)
+        val currencySymbol = data.optStringNonEmpty(AuctionBidFields.CURRENCY_SYMBOL) ?: "$"
+        val currentBid = data.optString(AuctionBidFields.CURRENT_BID)
+        val bidCount = data.optInt(AuctionBidFields.BID_COUNT, 0)
+        val endTime = data.optLong(AuctionBidFields.END_TIME).takeIf { it > 0 }
+        val statusMessage = data.optString(AuctionBidFields.STATUS_MESSAGE)
+        val isUserHighBidder = data.optBoolean(AuctionBidFields.IS_USER_HIGH_BIDDER, false)
+        val userBidAmount = data.optStringNonEmpty(AuctionBidFields.USER_BID_AMOUNT)
 
         val body = "$statusMessage · $currencySymbol$currentBid"
         val subText = userBidAmount
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
index 066422911..8585923bf 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/CountdownTimerTemplate.kt
@@ -23,11 +23,11 @@ internal object CountdownTimerTemplate : LiveNotificationTemplate {
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val title = data.optString("title")
-        val heroImageKey = data.optStringNonEmpty("heroImageKey")
-        val targetDate = data.optLong("targetDate").takeIf { it > 0 }
-        val statusMessage = data.optString("statusMessage")
-        val expiredMessage = data.optStringNonEmpty("expiredMessage")
+        val title = data.optString(CountdownTimerFields.TITLE)
+        val heroImageKey = data.optStringNonEmpty(CountdownTimerFields.HERO_IMAGE_KEY)
+        val targetDate = data.optLong(CountdownTimerFields.TARGET_DATE).takeIf { it > 0 }
+        val statusMessage = data.optString(CountdownTimerFields.STATUS_MESSAGE)
+        val expiredMessage = data.optStringNonEmpty(CountdownTimerFields.EXPIRED_MESSAGE)
 
         val now = System.currentTimeMillis()
         val isPostTarget = targetDate != null && now >= targetDate
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
index 11b20f046..b35010aeb 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/DeliveryTrackingTemplate.kt
@@ -22,14 +22,14 @@ internal object DeliveryTrackingTemplate : LiveNotificationTemplate {
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val orderId = data.optString("orderId")
-        val recipientName = data.optStringNonEmpty("recipientName")
-        val statusMessage = data.optString("statusMessage")
-        val statusImageKey = data.optStringNonEmpty("statusImageKey")
-        val stepCurrent = data.optInt("stepCurrent", 0)
-        val stepTotal = data.optInt("stepTotal", 1).coerceAtLeast(1)
-        val estimatedArrival = data.optLong("estimatedArrival").takeIf { it > 0 }
-        val driverName = data.optStringNonEmpty("driverName")
+        val orderId = data.optString(DeliveryTrackingFields.ORDER_ID)
+        val recipientName = data.optStringNonEmpty(DeliveryTrackingFields.RECIPIENT_NAME)
+        val statusMessage = data.optString(DeliveryTrackingFields.STATUS_MESSAGE)
+        val statusImageKey = data.optStringNonEmpty(DeliveryTrackingFields.STATUS_IMAGE_KEY)
+        val stepCurrent = data.optInt(DeliveryTrackingFields.STEP_CURRENT, 0)
+        val stepTotal = data.optInt(DeliveryTrackingFields.STEP_TOTAL, 1).coerceAtLeast(1)
+        val estimatedArrival = data.optLong(DeliveryTrackingFields.ESTIMATED_ARRIVAL).takeIf { it > 0 }
+        val driverName = data.optStringNonEmpty(DeliveryTrackingFields.DRIVER_NAME)
 
         val title = recipientName?.let { "Delivery for $it" } ?: "Order #$orderId"
         val subText = when {
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
index d434bf7c7..1cb7668d5 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/FlightStatusTemplate.kt
@@ -25,21 +25,21 @@ internal object FlightStatusTemplate : LiveNotificationTemplate {
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val flightNumber = data.optString("flightNumber")
-        val origin = data.optJSONObject("origin")
-        val destination = data.optJSONObject("destination")
-        val originCode = origin?.optString("code").orEmpty()
-        val destinationCode = destination?.optString("code").orEmpty()
+        val flightNumber = data.optString(FlightStatusFields.FLIGHT_NUMBER)
+        val origin = data.optJSONObject(FlightStatusFields.ORIGIN)
+        val destination = data.optJSONObject(FlightStatusFields.DESTINATION)
+        val originCode = origin?.optString(AirportFields.CODE).orEmpty()
+        val destinationCode = destination?.optString(AirportFields.CODE).orEmpty()
 
-        val statusMessage = data.optString("statusMessage")
-        val gate = data.optStringNonEmpty("gate")
-        val terminal = data.optStringNonEmpty("terminal")
-        val scheduledDeparture = data.optLong("scheduledDeparture").takeIf { it > 0 }
-        val estimatedArrival = data.optLong("estimatedArrival").takeIf { it > 0 }
+        val statusMessage = data.optString(FlightStatusFields.STATUS_MESSAGE)
+        val gate = data.optStringNonEmpty(FlightStatusFields.GATE)
+        val terminal = data.optStringNonEmpty(FlightStatusFields.TERMINAL)
+        val scheduledDeparture = data.optLong(FlightStatusFields.SCHEDULED_DEPARTURE).takeIf { it > 0 }
+        val estimatedArrival = data.optLong(FlightStatusFields.ESTIMATED_ARRIVAL).takeIf { it > 0 }
         val progressFractionRaw =
-            if (data.has("progressFraction")) data.optDouble("progressFraction") else Double.NaN
+            if (data.has(FlightStatusFields.PROGRESS_FRACTION)) data.optDouble(FlightStatusFields.PROGRESS_FRACTION) else Double.NaN
         val progressFraction = progressFractionRaw.takeIf { !it.isNaN() }
-        val delayMinutes = data.optInt("delayMinutes", 0).takeIf { it > 0 }
+        val delayMinutes = data.optInt(FlightStatusFields.DELAY_MINUTES, 0).takeIf { it > 0 }
 
         val title = "$flightNumber · $originCode → $destinationCode"
         val subText = "Gate ${gate ?: "TBA"} · Terminal ${terminal ?: "TBA"}"
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationFields.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationFields.kt
new file mode 100644
index 000000000..51a195bdf
--- /dev/null
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveNotificationFields.kt
@@ -0,0 +1,74 @@
+package io.customer.messagingpush.livenotification.template
+
+/**
+ * Single source of truth for live-notification field names. Referenced by both
+ * the push-render path (each `*Template.render` reading the flattened payload)
+ * and the local-start path (`LiveNotificationData.fields()`), so the two can't
+ * drift apart.
+ */
+internal object DeliveryTrackingFields {
+    const val ORDER_ID = "orderId"
+    const val RECIPIENT_NAME = "recipientName"
+    const val STATUS_MESSAGE = "statusMessage"
+    const val STATUS_IMAGE_KEY = "statusImageKey"
+    const val STEP_CURRENT = "stepCurrent"
+    const val STEP_TOTAL = "stepTotal"
+    const val ESTIMATED_ARRIVAL = "estimatedArrival"
+    const val DRIVER_NAME = "driverName"
+}
+
+internal object FlightStatusFields {
+    const val FLIGHT_NUMBER = "flightNumber"
+    const val ORIGIN = "origin"
+    const val DESTINATION = "destination"
+    const val STATUS_MESSAGE = "statusMessage"
+    const val GATE = "gate"
+    const val TERMINAL = "terminal"
+    const val SCHEDULED_DEPARTURE = "scheduledDeparture"
+    const val ESTIMATED_ARRIVAL = "estimatedArrival"
+    const val PROGRESS_FRACTION = "progressFraction"
+    const val DELAY_MINUTES = "delayMinutes"
+}
+
+internal object LiveScoreFields {
+    const val HOME_TEAM = "homeTeam"
+    const val AWAY_TEAM = "awayTeam"
+    const val HOME_SCORE = "homeScore"
+    const val AWAY_SCORE = "awayScore"
+    const val PERIOD = "period"
+    const val CLOCK = "clock"
+    const val STATUS_MESSAGE = "statusMessage"
+    const val SPORT = "sport"
+    const val LEAGUE_LOGO_KEY = "leagueLogoKey"
+}
+
+internal object CountdownTimerFields {
+    const val TITLE = "title"
+    const val HERO_IMAGE_KEY = "heroImageKey"
+    const val TARGET_DATE = "targetDate"
+    const val STATUS_MESSAGE = "statusMessage"
+    const val EXPIRED_MESSAGE = "expiredMessage"
+}
+
+internal object AuctionBidFields {
+    const val ITEM_TITLE = "itemTitle"
+    const val ITEM_IMAGE_KEY = "itemImageKey"
+    const val CURRENCY_SYMBOL = "currencySymbol"
+    const val CURRENT_BID = "currentBid"
+    const val BID_COUNT = "bidCount"
+    const val END_TIME = "endTime"
+    const val STATUS_MESSAGE = "statusMessage"
+    const val IS_USER_HIGH_BIDDER = "isUserHighBidder"
+    const val USER_BID_AMOUNT = "userBidAmount"
+}
+
+/** Nested object sub-fields shared by templates that embed them. */
+internal object AirportFields {
+    const val CODE = "code"
+    const val CITY = "city"
+}
+
+internal object TeamFields {
+    const val NAME = "name"
+    const val LOGO_KEY = "logoKey"
+}
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
index 0a896510c..b63ccf2f0 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/LiveScoreTemplate.kt
@@ -26,16 +26,16 @@ internal object LiveScoreTemplate : LiveNotificationTemplate {
         smallIcon: Int,
         fallbackTintColor: Int?
     ): TemplateRenderResult {
-        val homeTeam = data.optJSONObject("homeTeam")
-        val awayTeam = data.optJSONObject("awayTeam")
-        val homeName = homeTeam?.optString("name").orEmpty()
-        val awayName = awayTeam?.optString("name").orEmpty()
-        val homeScore = data.optInt("homeScore", 0)
-        val awayScore = data.optInt("awayScore", 0)
-        val period = data.optString("period")
-        val clock = data.optStringNonEmpty("clock")
-        val statusMessage = data.optStringNonEmpty("statusMessage")
-        val leagueLogoKey = data.optStringNonEmpty("leagueLogoKey")
+        val homeTeam = data.optJSONObject(LiveScoreFields.HOME_TEAM)
+        val awayTeam = data.optJSONObject(LiveScoreFields.AWAY_TEAM)
+        val homeName = homeTeam?.optString(TeamFields.NAME).orEmpty()
+        val awayName = awayTeam?.optString(TeamFields.NAME).orEmpty()
+        val homeScore = data.optInt(LiveScoreFields.HOME_SCORE, 0)
+        val awayScore = data.optInt(LiveScoreFields.AWAY_SCORE, 0)
+        val period = data.optString(LiveScoreFields.PERIOD)
+        val clock = data.optStringNonEmpty(LiveScoreFields.CLOCK)
+        val statusMessage = data.optStringNonEmpty(LiveScoreFields.STATUS_MESSAGE)
+        val leagueLogoKey = data.optStringNonEmpty(LiveScoreFields.LEAGUE_LOGO_KEY)
 
         val title = "$homeName $homeScore - $awayScore $awayName"
         val body = statusMessage
diff --git a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
index 53dd3bced..5dfa5930f 100644
--- a/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
+++ b/messagingpush/src/main/java/io/customer/messagingpush/livenotification/template/TemplateRegistry.kt
@@ -1,21 +1,15 @@
 package io.customer.messagingpush.livenotification.template
 
-internal object TemplateRegistry {
+import io.customer.messagingpush.livenotification.LiveNotificationType
 
-    const val DELIVERY_TRACKING = "io.customer.liveactivities.deliverytracking"
-    const val FLIGHT_STATUS = "io.customer.liveactivities.flightstatus"
-    const val LIVE_SCORE = "io.customer.liveactivities.livescore"
-    const val COUNTDOWN_TIMER = "io.customer.liveactivities.countdowntimer"
-    const val AUCTION_BID = "io.customer.liveactivities.auctionbid"
+internal object TemplateRegistry {
 
-    /** The built-in activity types the SDK registers for and can render. */
-    val builtInTypes: List<String> = listOf(
-        DELIVERY_TRACKING,
-        FLIGHT_STATUS,
-        LIVE_SCORE,
-        COUNTDOWN_TIMER,
-        AUCTION_BID
-    )
+    // Aliases to the public identifiers (single source of truth: LiveNotificationType).
+    const val DELIVERY_TRACKING = LiveNotificationType.DELIVERY_TRACKING
+    const val FLIGHT_STATUS = LiveNotificationType.FLIGHT_STATUS
+    const val LIVE_SCORE = LiveNotificationType.LIVE_SCORE
+    const val COUNTDOWN_TIMER = LiveNotificationType.COUNTDOWN_TIMER
+    const val AUCTION_BID = LiveNotificationType.AUCTION_BID
 
     fun find(name: String?): LiveNotificationTemplate? = when (name) {
         DELIVERY_TRACKING -> DeliveryTrackingTemplate
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationCallbackTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationCallbackTest.kt
new file mode 100644
index 000000000..3c8168dae
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationCallbackTest.kt
@@ -0,0 +1,115 @@
+package io.customer.messagingpush
+
+import android.app.Notification
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Bundle
+import androidx.core.app.NotificationCompat
+import io.customer.commontest.extensions.assertCalledNever
+import io.customer.commontest.extensions.attachToSDKComponent
+import io.customer.messagingpush.data.communication.CustomerIOPushNotificationCallback
+import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
+import io.customer.messagingpush.livenotification.LiveNotificationType
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+/**
+ * Covers the host-app render override (`createLiveNotification`) and
+ * customer-defined activity types.
+ */
+@RunWith(RobolectricTestRunner::class)
+internal class LiveNotificationCallbackTest : IntegrationTest() {
+
+    private val notificationManager: NotificationManager = mockk(relaxed = true)
+    private val customType = "com.acme.live.ride"
+
+    private fun attach(callback: CustomerIOPushNotificationCallback?) {
+        ModuleMessagingPushFCM(
+            MessagingPushModuleConfig.Builder().apply {
+                callback?.let { setNotificationCallback(it) }
+                // Enable a built-in type (for the override test) and the custom type.
+                setLiveNotificationTypes(LiveNotificationType.DELIVERY_TRACKING, customType)
+            }.build()
+        ).attachToSDKComponent()
+    }
+
+    private fun callbackReturning(notification: Notification) = object : CustomerIOPushNotificationCallback {
+        override fun createLiveNotification(payload: CustomerIOParsedPushPayload, context: Context): Notification =
+            notification
+    }
+
+    private fun appNotification(title: String): Notification =
+        NotificationCompat.Builder(contextMock, "channel").setSmallIcon(0).setContentTitle(title).build()
+
+    private fun bundle(activityType: String, event: String = "start"): Bundle = Bundle().apply {
+        putString(LiveNotificationHandler.ACTIVITY_ID_KEY, "act-cb")
+        putString(LiveNotificationHandler.EVENT_KEY, event)
+        putString(LiveNotificationHandler.ACTIVITY_TYPE_KEY, activityType)
+    }
+
+    private fun invoke(b: Bundle) = LiveNotificationHandler(b).handle(
+        context = contextMock,
+        deliveryId = "d",
+        deliveryToken = "t",
+        smallIcon = 0,
+        tintColor = null,
+        channelId = "channel",
+        notificationManager = notificationManager
+    )
+
+    @Test
+    fun builtInType_callbackReturningNotification_isPostedInsteadOfTemplate() {
+        val custom = appNotification("App rendered")
+        attach(callbackReturning(custom))
+        val posted = slot<Notification>()
+        every { notificationManager.notify(any<String>(), any<Int>(), capture(posted)) } returns Unit
+
+        invoke(bundle(LiveNotificationType.DELIVERY_TRACKING))
+
+        posted.captured shouldBeEqualTo custom
+    }
+
+    @Test
+    fun customType_withCallback_isRendered() {
+        val custom = appNotification("Custom render")
+        attach(callbackReturning(custom))
+
+        invoke(bundle(customType))
+
+        verify(exactly = 1) {
+            notificationManager.notify("act-cb", any<Int>(), custom)
+        }
+    }
+
+    @Test
+    fun customType_withoutCallback_isDropped() {
+        attach(callback = null) // enabled type, but no renderer
+
+        invoke(bundle(customType))
+
+        assertCalledNever {
+            notificationManager.notify(any<String>(), any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun customType_endWithoutRenderer_stillCancels() {
+        // Even with no notification to post (custom type, no callback), an `end` must
+        // still cancel/clean up the existing notification.
+        attach(callback = null)
+        val expectedNotifId = "act-cb".hashCode() and 0x7FFFFFFF
+
+        invoke(bundle(customType, event = "end"))
+
+        verify(exactly = 1) {
+            notificationManager.cancel("act-cb", expectedNotifId)
+        }
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
index d09e0ec74..4a1399e0e 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/LiveNotificationHandlerTest.kt
@@ -3,7 +3,10 @@ package io.customer.messagingpush
 import android.app.Notification
 import android.app.NotificationManager
 import android.os.Bundle
+import io.customer.commontest.config.TestConfig
 import io.customer.commontest.extensions.assertCalledNever
+import io.customer.commontest.extensions.attachToSDKComponent
+import io.customer.messagingpush.livenotification.LiveNotificationType
 import io.customer.messagingpush.livenotification.template.TemplateRegistry
 import io.customer.messagingpush.testutils.core.IntegrationTest
 import io.mockk.every
@@ -37,6 +40,20 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
     private val notificationManager: NotificationManager = mockk(relaxed = true)
     private val channelId = "live-notifications"
 
+    override fun setup(testConfig: TestConfig) {
+        super.setup(testConfig)
+        // Live notifications are opt-in; enable all built-in types so the dispatch tests run.
+        ModuleMessagingPushFCM(
+            MessagingPushModuleConfig.Builder().setLiveNotificationTypes(
+                LiveNotificationType.DELIVERY_TRACKING,
+                LiveNotificationType.FLIGHT_STATUS,
+                LiveNotificationType.LIVE_SCORE,
+                LiveNotificationType.COUNTDOWN_TIMER,
+                LiveNotificationType.AUCTION_BID
+            ).build()
+        ).attachToSDKComponent()
+    }
+
     private fun newBundle(
         activityId: String? = "live-act-1",
         event: String? = "start",
@@ -300,4 +317,52 @@ internal class LiveNotificationHandlerTest : IntegrationTest() {
             notificationManager.cancel(activityId, expectedNotifId)
         }
     }
+
+    @Test
+    fun handle_givenStaleEndTimestamp_stillCancels() {
+        // `end` is terminal and bypasses the out-of-order guard, so it always cancels
+        // even if its timestamp is not newer than the last update.
+        val activityId = "stale-end"
+        val expectedNotifId = activityId.hashCode() and 0x7FFFFFFF
+
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 100L)))
+        invoke(handlerFor(newBundle(activityId = activityId, event = "end", timestamp = 50L)))
+
+        verify(exactly = 1) {
+            notificationManager.cancel(activityId, expectedNotifId)
+        }
+    }
+
+    @Test
+    fun handle_givenStaleUpdateAfterEnd_isDropped() {
+        // `end` records its timestamp as the high-water mark (not cleared), so a delayed
+        // older update arriving after `end` is dropped rather than resurrecting it.
+        val activityId = "update-after-end"
+
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 100L)))
+        invoke(handlerFor(newBundle(activityId = activityId, event = "end", timestamp = 200L)))
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 150L)))
+
+        // Only the first update and the end posted; the stale 150 update was dropped.
+        verify(exactly = 2) {
+            notificationManager.notify(activityId, any<Int>(), any<Notification>())
+        }
+    }
+
+    @Test
+    fun handle_givenStaleEndThenStaleUpdate_doesNotResurrect() {
+        // A stale, out-of-order `end` (lower timestamp) bypasses the guard to cancel, but
+        // must NOT lower the high-water mark; otherwise a later stale update could slip
+        // through and resurrect the cancelled activity.
+        val activityId = "stale-end-then-update"
+
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 100L)))
+        invoke(handlerFor(newBundle(activityId = activityId, event = "end", timestamp = 50L)))
+        invoke(handlerFor(newBundle(activityId = activityId, event = "update", timestamp = 75L)))
+
+        // Mark stays at 100, so the 75 update is dropped: only the first update and the end posted.
+        verify(exactly = 2) {
+            notificationManager.notify(activityId, any<Int>(), any<Notification>())
+        }
+    }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt
index bcc8a50fe..1e6e95dfa 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/MessagingPushModuleConfigTest.kt
@@ -11,6 +11,6 @@ class MessagingPushModuleConfigTest : JUnit5Test() {
         val config = MessagingPushModuleConfig.default()
 
         val actual = config.toString()
-        assertEquals("MessagingPushModuleConfig(autoTrackPushEvents=true, notificationCallback=null, pushClickBehavior=ACTIVITY_PREVENT_RESTART, liveNotificationBranding=null)", actual)
+        assertEquals("MessagingPushModuleConfig(autoTrackPushEvents=true, notificationCallback=null, pushClickBehavior=ACTIVITY_PREVENT_RESTART, liveNotificationBranding=null, liveNotificationTypes=[])", actual)
     }
 }
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationDataTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationDataTest.kt
new file mode 100644
index 000000000..2f484aded
--- /dev/null
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationDataTest.kt
@@ -0,0 +1,55 @@
+package io.customer.messagingpush.livenotification
+
+import io.customer.messagingpush.livenotification.template.TemplateRegistry
+import io.customer.messagingpush.testutils.core.IntegrationTest
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeFalse
+import org.amshove.kluent.shouldBeNull
+import org.json.JSONObject
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+internal class LiveNotificationDataTest : IntegrationTest() {
+
+    @Test
+    fun deliveryTracking_mapsActivityTypeAndScalarFields() {
+        val data = LiveNotificationData.DeliveryTracking(
+            orderId = "A-1",
+            statusMessage = "On the way",
+            stepCurrent = 1,
+            stepTotal = 3
+        )
+
+        data.activityType shouldBeEqualTo TemplateRegistry.DELIVERY_TRACKING
+        val fields = data.fields()
+        fields["orderId"] shouldBeEqualTo "A-1"
+        fields["statusMessage"] shouldBeEqualTo "On the way"
+        fields["stepCurrent"] shouldBeEqualTo 1
+        fields["stepTotal"] shouldBeEqualTo 3
+        // Unset optional fields are present as null; the manager omits them from the envelope.
+        fields["recipientName"].shouldBeNull()
+    }
+
+    @Test
+    fun flightStatus_nestedAirportsSerializeToJson() {
+        val data = LiveNotificationData.FlightStatus(
+            flightNumber = "AA1",
+            origin = LiveNotificationData.Airport("JFK", "New York"),
+            destination = LiveNotificationData.Airport("LAX"),
+            statusMessage = "On time"
+        )
+
+        data.activityType shouldBeEqualTo TemplateRegistry.FLIGHT_STATUS
+
+        val origin = data.fields()["origin"] as JSONObject
+        origin.getString("code") shouldBeEqualTo "JFK"
+        origin.getString("city") shouldBeEqualTo "New York"
+
+        val destination = data.fields()["destination"] as JSONObject
+        destination.getString("code") shouldBeEqualTo "LAX"
+        // city omitted when not provided.
+        destination.has("city").shouldBeFalse()
+    }
+}
diff --git a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt
index 96c3e6c1f..d4e9a6732 100644
--- a/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt
+++ b/messagingpush/src/test/java/io/customer/messagingpush/livenotification/LiveNotificationLifecycleClientTest.kt
@@ -45,6 +45,26 @@ internal class LiveNotificationLifecycleClientTest : IntegrationTest() {
         body shouldContain "user-1"
     }
 
+    @Test
+    fun registerInstance_buildsPutPushTokenWithActivityType() = runTest {
+        val params = slot<HttpRequestParams>()
+        coEvery { httpClient.request(capture(params)) } returns Result.success("")
+
+        client.registerInstance(
+            activityId = "act-9",
+            activityType = "io.customer.liveactivities.deliverytracking",
+            token = "tok",
+            userId = "user"
+        )
+
+        params.captured.method shouldBeEqualTo HttpMethod.PUT
+        params.captured.path shouldBeEqualTo "/v1/live_activities/act-9/push_token"
+        val body = params.captured.body!!
+        body shouldContain "\"activity_type\":\"io.customer.liveactivities.deliverytracking\""
+        body shouldContain "\"os\":\"android\""
+        body shouldContain "\"transport\":\"fcm\""
+    }
+
     @Test
     fun reportDismissed_buildsDeleteWithEmptyBody() = runTest {
         val params = slot<HttpRequestParams>()
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
index 8d0d3a4b3..9d680d6d1 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
@@ -21,6 +21,7 @@
 import io.customer.messagingpush.MessagingPushModuleConfig;
 import io.customer.messagingpush.ModuleMessagingPushFCM;
 import io.customer.messagingpush.livenotification.LiveNotificationBranding;
+import io.customer.messagingpush.livenotification.LiveNotificationType;
 import io.customer.sdk.CustomerIO;
 import io.customer.sdk.CustomerIOConfig;
 import io.customer.sdk.CustomerIOConfigBuilder;
@@ -29,6 +30,13 @@
  * Repository class to hold all Customer.io related operations at single place
  */
 public class CustomerIORepository {
+
+    /**
+     * The push module instance, retained so the live-notification demo screen can call
+     * {@link ModuleMessagingPushFCM#startLiveNotification} (the public local-start API).
+     */
+    public static ModuleMessagingPushFCM messagingPushModule;
+
     public void initializeSdk(SampleApplication application) {
         ApplicationGraph appGraph = application.getApplicationGraph();
         // Get desired SDK config, only required by sample app
@@ -43,15 +51,24 @@ public void initializeSdk(SampleApplication application) {
 
         // Enable optional features of the SDK by adding desired modules.
         // Enables push notification with live-notification branding registered once at init.
-        builder.addCustomerIOModule(new ModuleMessagingPushFCM(
+        messagingPushModule = new ModuleMessagingPushFCM(
                 new MessagingPushModuleConfig.Builder()
                         .setLiveNotificationBranding(new LiveNotificationBranding(
                                 "Customer.io Sample",
                                 Color.parseColor("#1B5E20"),
                                 null
                         ))
+                        // Live notifications are opt-in: enable the built-in template types.
+                        .setLiveNotificationTypes(
+                                LiveNotificationType.DELIVERY_TRACKING,
+                                LiveNotificationType.FLIGHT_STATUS,
+                                LiveNotificationType.LIVE_SCORE,
+                                LiveNotificationType.COUNTDOWN_TIMER,
+                                LiveNotificationType.AUCTION_BID
+                        )
                         .build()
-        ));
+        );
+        builder.addCustomerIOModule(messagingPushModule);
 
         // Enables location tracking
         builder.addCustomerIOModule(new ModuleLocation(
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
index c9ae523ec..0576a4df9 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
@@ -13,8 +13,11 @@
 
 import io.customer.android.sample.java_layout.R;
 import io.customer.android.sample.java_layout.databinding.ActivityLiveNotificationDemoBinding;
+import io.customer.android.sample.java_layout.sdk.CustomerIORepository;
 import io.customer.android.sample.java_layout.ui.core.BaseActivity;
 import io.customer.messagingpush.CustomerIOFirebaseMessagingService;
+import io.customer.messagingpush.ModuleMessagingPushFCM;
+import io.customer.messagingpush.livenotification.LiveNotificationType;
 
 /**
  * Demo activity that simulates templated live-notification updates by sending
@@ -68,6 +71,7 @@ protected void setupContent() {
         binding.endButton.setOnClickListener(v -> end());
         binding.autoButton.setOnClickListener(v -> autoRun());
         binding.unknownActivityTypeButton.setOnClickListener(v -> sendUnknownActivityType());
+        binding.apiStartButton.setOnClickListener(v -> startViaApi());
 
         binding.typeRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
             if (isActive) {
@@ -303,6 +307,26 @@ private void sendAuctionBid(String event, int step) {
         fire(buildBundle("demo-auction-bid", event, ACTIVITY_TYPE_AUCTION_BID, attributes, contentState));
     }
 
+    /**
+     * Exercises the public local-start API: the SDK generates the activity id, renders
+     * the notification immediately, and registers the instance with the backend.
+     */
+    private void startViaApi() {
+        ModuleMessagingPushFCM module = CustomerIORepository.messagingPushModule;
+        if (module == null) return;
+        java.util.Map<String, Object> data = new java.util.HashMap<>();
+        data.put("orderId", "API-1001");
+        data.put("recipientName", "Mahmoud");
+        data.put("statusMessage", "Out for delivery (started via API)");
+        data.put("statusImageKey", "delivery_truck");
+        data.put("stepCurrent", 3);
+        data.put("stepTotal", 4);
+        data.put("driverName", "Sara");
+        data.put("estimatedArrival", System.currentTimeMillis() + 30L * 60 * 1000);
+        String activityId = module.startLiveNotification(LiveNotificationType.DELIVERY_TRACKING, data);
+        binding.statusTextView.setText(getString(R.string.live_notification_status_format, "API:" + activityId, 1));
+    }
+
     private void sendUnknownActivityType() {
         // Exercises LiveNotificationHandler's "Unknown live notification template" log path.
         JSONObject attributes = new JSONObject();
diff --git a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
index b49a28b37..6c1cc4c21 100644
--- a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
+++ b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
@@ -146,5 +146,13 @@
             android:layout_marginTop="@dimen/margin_default"
             android:text="@string/live_notification_debug_unknown_activity_type" />
 
+        <Button
+            android:id="@+id/api_start_button"
+            style="?attr/materialButtonOutlinedStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:text="@string/live_notification_debug_start_via_api" />
+
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/samples/java_layout/src/main/res/values/strings.xml b/samples/java_layout/src/main/res/values/strings.xml
index 3173c4447..5c823bcbf 100644
--- a/samples/java_layout/src/main/res/values/strings.xml
+++ b/samples/java_layout/src/main/res/values/strings.xml
@@ -177,5 +177,6 @@
     <string name="live_notification_type_auction_bid">Auction Bid</string>
     <string name="live_notification_section_debug">Debug</string>
     <string name="live_notification_debug_unknown_activity_type">Fire unknown activity_type</string>
+    <string name="live_notification_debug_start_via_api">Start via startLiveNotification() API</string>
 
 </resources>

From 050f431080a31ed481dea37a63998924e26c8099 Mon Sep 17 00:00:00 2001
From: Mahmoud Elmorabea <mahmoud.elmorabea@gmail.com>
Date: Mon, 15 Jun 2026 11:57:39 +0400
Subject: [PATCH 10/10] =?UTF-8?q?chore(sample):=20expand=20live-notificati?=
 =?UTF-8?q?on=20demo=20=E2=80=94=20custom=20types,=20callback,=20step=20ic?=
 =?UTF-8?q?ons,=20campaign=20trigger=20(#729)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../java_layout/sdk/CustomerIORepository.java |   9 +-
 .../sdk/LiveNotificationCallback.kt           | 174 +++++++++++++++
 .../LiveNotificationDemoActivity.java         | 157 ++++++++++++--
 .../main/res/drawable/delivery_delivered.xml  |   9 +
 .../main/res/drawable/delivery_ordered.xml    |   9 +
 .../main/res/drawable/delivery_preparing.xml  |   9 +
 .../main/res/drawable/ic_rideshare_car.xml    |   9 +
 .../src/main/res/drawable/ic_step_active.xml  |   9 +
 .../src/main/res/drawable/ic_step_done.xml    |   9 +
 .../src/main/res/drawable/ic_step_pending.xml |   9 +
 .../src/main/res/drawable/ic_workout_run.xml  |   9 +
 .../activity_live_notification_demo.xml       |  55 ++++-
 .../notification_rideshare_collapsed.xml      |  72 +++++++
 .../notification_rideshare_expanded.xml       | 199 ++++++++++++++++++
 .../src/main/res/values/strings.xml           |  13 +-
 15 files changed, 733 insertions(+), 18 deletions(-)
 create mode 100644 samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/LiveNotificationCallback.kt
 create mode 100644 samples/java_layout/src/main/res/drawable/delivery_delivered.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/delivery_ordered.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/delivery_preparing.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/ic_rideshare_car.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/ic_step_active.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/ic_step_done.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/ic_step_pending.xml
 create mode 100644 samples/java_layout/src/main/res/drawable/ic_workout_run.xml
 create mode 100644 samples/java_layout/src/main/res/layout/notification_rideshare_collapsed.xml
 create mode 100644 samples/java_layout/src/main/res/layout/notification_rideshare_expanded.xml

diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
index 9d680d6d1..5506ee864 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/CustomerIORepository.java
@@ -58,13 +58,18 @@ public void initializeSdk(SampleApplication application) {
                                 Color.parseColor("#1B5E20"),
                                 null
                         ))
-                        // Live notifications are opt-in: enable the built-in template types.
+                        // App-rendered custom types go through this callback.
+                        .setNotificationCallback(new LiveNotificationCallback())
+                        // Live notifications are opt-in: enable the built-in template
+                        // types plus our two custom (app-rendered) types.
                         .setLiveNotificationTypes(
                                 LiveNotificationType.DELIVERY_TRACKING,
                                 LiveNotificationType.FLIGHT_STATUS,
                                 LiveNotificationType.LIVE_SCORE,
                                 LiveNotificationType.COUNTDOWN_TIMER,
-                                LiveNotificationType.AUCTION_BID
+                                LiveNotificationType.AUCTION_BID,
+                                LiveNotificationCallback.ACTIVITY_TYPE_RIDESHARE,
+                                LiveNotificationCallback.ACTIVITY_TYPE_WORKOUT
                         )
                         .build()
         );
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/LiveNotificationCallback.kt b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/LiveNotificationCallback.kt
new file mode 100644
index 000000000..6dba24bba
--- /dev/null
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/sdk/LiveNotificationCallback.kt
@@ -0,0 +1,174 @@
+package io.customer.android.sample.java_layout.sdk
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat
+import io.customer.android.sample.java_layout.R
+import io.customer.messagingpush.data.communication.CustomerIOPushNotificationCallback
+import io.customer.messagingpush.data.model.CustomerIOParsedPushPayload
+
+/**
+ * Sample host-app renderer for **custom** live-notification activity types — the
+ * ones the SDK has no built-in template for. The SDK calls
+ * [createLiveNotification] for every live-notification event; we return a fully
+ * app-built [Notification] for the two custom types and `null` for the built-in
+ * ones (so the SDK keeps rendering those from its own templates).
+ *
+ * Two deliberately different rendering strategies are shown:
+ *  - [ACTIVITY_TYPE_RIDESHARE] → a **completely custom RemoteViews layout**
+ *    (collapsed + expanded), with an app-drawn 4-stop progress strip.
+ *  - [ACTIVITY_TYPE_WORKOUT] → the **standard NotificationCompat builder API**
+ *    (determinate progress + BigTextStyle + action), requesting promoted-ongoing
+ *    treatment on Android 16+.
+ *
+ * The SDK still owns posting: it keys the notification by `activity_id` (so
+ * updates replace it) and cancels it on `end`.
+ */
+class LiveNotificationCallback : CustomerIOPushNotificationCallback {
+
+    override fun createLiveNotification(
+        payload: CustomerIOParsedPushPayload,
+        context: Context
+    ): Notification? {
+        val extras = payload.extras
+        val activityType = extras.getString(KEY_ACTIVITY_TYPE) ?: return null
+        val ended = extras.getString(KEY_EVENT) == EVENT_END
+        ensureChannel(context)
+        return when (activityType) {
+            ACTIVITY_TYPE_RIDESHARE -> buildRideshare(context, extras, ended)
+            ACTIVITY_TYPE_WORKOUT -> buildWorkout(context, extras, ended)
+            // Not one of ours — let the SDK render its built-in template.
+            else -> null
+        }
+    }
+
+    // --- Custom type 1: fully custom RemoteViews layout ---
+
+    private fun buildRideshare(context: Context, extras: Bundle, ended: Boolean): Notification {
+        val driver = extras.getString("driverName") ?: "Your driver"
+        val vehicle = extras.getString("vehicle") ?: ""
+        val plate = extras.getString("plate") ?: ""
+        val eta = extras.getString("etaText") ?: ""
+        val status = extras.getString("statusMessage") ?: ""
+        val step = extras.getString("step")?.toIntOrNull() ?: 0
+        val progress = extras.getString("progress")?.toIntOrNull() ?: 0
+
+        val title = if (ended) "Trip complete" else "$driver is on the way"
+        val subtitle = listOf(vehicle, plate).filter { it.isNotBlank() }.joinToString(" · ")
+        val etaText = if (ended) "Done" else eta
+
+        fun applyHeader(rv: RemoteViews) {
+            rv.setTextViewText(R.id.tv_title, title)
+            rv.setTextViewText(R.id.tv_subtitle, subtitle)
+            rv.setTextViewText(R.id.tv_eta, etaText)
+        }
+
+        val collapsed = RemoteViews(context.packageName, R.layout.notification_rideshare_collapsed)
+        applyHeader(collapsed)
+
+        val expanded = RemoteViews(context.packageName, R.layout.notification_rideshare_expanded)
+        applyHeader(expanded)
+        expanded.setTextViewText(R.id.tv_status, if (ended) "Thanks for riding with us" else status)
+
+        val stepIds = intArrayOf(R.id.iv_step1, R.id.iv_step2, R.id.iv_step3, R.id.iv_step4)
+        for (i in stepIds.indices) {
+            val icon = when {
+                ended || i < step -> R.drawable.ic_step_done
+                i == step -> R.drawable.ic_step_active
+                else -> R.drawable.ic_step_pending
+            }
+            expanded.setImageViewResource(stepIds[i], icon)
+        }
+        expanded.setProgressBar(R.id.progress_bar, 100, if (ended) 100 else progress, false)
+
+        return NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_rideshare_car)
+            .setCustomContentView(collapsed)
+            .setCustomBigContentView(expanded)
+            .setOngoing(!ended)
+            .setOnlyAlertOnce(true)
+            .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+            .build()
+    }
+
+    // --- Custom type 2: standard NotificationCompat builder API ---
+
+    private fun buildWorkout(context: Context, extras: Bundle, ended: Boolean): Notification {
+        val title = extras.getString("workoutTitle") ?: "Workout"
+        val distance = extras.getString("distance") ?: ""
+        val duration = extras.getString("duration") ?: ""
+        val pace = extras.getString("pace") ?: ""
+        val progress = extras.getString("progress")?.toIntOrNull() ?: 0
+        val summary = listOf(distance, duration, pace).filter { it.isNotBlank() }.joinToString(" · ")
+
+        val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_workout_run)
+            .setContentTitle(if (ended) "$title complete" else title)
+            .setContentText(summary)
+            .setProgress(100, if (ended) 100 else progress, false)
+            .setStyle(
+                NotificationCompat.BigTextStyle()
+                    .bigText(if (ended) "$summary\nGreat job — workout saved." else "$summary\nKeep going!")
+            )
+            .setOngoing(!ended)
+            .setOnlyAlertOnce(true)
+            .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+
+        if (!ended) {
+            val pauseIntent = PendingIntent.getBroadcast(
+                context,
+                0,
+                Intent(ACTION_WORKOUT_PAUSE),
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+            builder.addAction(R.drawable.ic_workout_run, "Pause", pauseIntent)
+        }
+
+        // Request live-update (promoted-ongoing) treatment on Android 16+ (BAKLAVA).
+        // Requires POST_PROMOTED_NOTIFICATIONS (declared in the manifest), an ongoing
+        // notification with a title, an allowed style (BigTextStyle), and no colorize.
+        if (Build.VERSION.SDK_INT >= 36 && !ended) {
+            builder.addExtras(Bundle().apply { putBoolean(EXTRA_REQUEST_PROMOTED_ONGOING, true) })
+        }
+
+        return builder.build()
+    }
+
+    private fun ensureChannel(context: Context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val manager = context.getSystemService(NotificationManager::class.java) ?: return
+            if (manager.getNotificationChannel(CHANNEL_ID) == null) {
+                manager.createNotificationChannel(
+                    NotificationChannel(
+                        CHANNEL_ID,
+                        "Custom Live Updates",
+                        NotificationManager.IMPORTANCE_DEFAULT
+                    )
+                )
+            }
+        }
+    }
+
+    companion object {
+        // Custom activity types (not built-in). Must also be passed to
+        // MessagingPushModuleConfig.Builder.setLiveNotificationTypes(...) to be enabled.
+        const val ACTIVITY_TYPE_RIDESHARE = "io.customer.liveactivities.custom.rideshare"
+        const val ACTIVITY_TYPE_WORKOUT = "io.customer.liveactivities.custom.workout"
+
+        private const val CHANNEL_ID = "cio_custom_live"
+        private const val KEY_ACTIVITY_TYPE = "activity_type"
+        private const val KEY_EVENT = "event"
+        private const val EVENT_END = "end"
+        private const val ACTION_WORKOUT_PAUSE = "io.customer.android.sample.java_layout.WORKOUT_PAUSE"
+
+        // Notification.EXTRA_REQUEST_PROMOTED_ONGOING (extension SDK 36.1) by raw value.
+        private const val EXTRA_REQUEST_PROMOTED_ONGOING = "android.requestPromotedOngoing"
+    }
+}
diff --git a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
index 0576a4df9..809e67124 100644
--- a/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
+++ b/samples/java_layout/src/main/java/io/customer/android/sample/java_layout/ui/livenotification/LiveNotificationDemoActivity.java
@@ -3,17 +3,22 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.widget.ArrayAdapter;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.google.firebase.messaging.RemoteMessage;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 import io.customer.android.sample.java_layout.R;
 import io.customer.android.sample.java_layout.databinding.ActivityLiveNotificationDemoBinding;
 import io.customer.android.sample.java_layout.sdk.CustomerIORepository;
+import io.customer.android.sample.java_layout.sdk.LiveNotificationCallback;
 import io.customer.android.sample.java_layout.ui.core.BaseActivity;
 import io.customer.messagingpush.CustomerIOFirebaseMessagingService;
 import io.customer.messagingpush.ModuleMessagingPushFCM;
@@ -34,7 +39,7 @@
 public class LiveNotificationDemoActivity extends BaseActivity<ActivityLiveNotificationDemoBinding> {
 
     private static final String DEMO_DELIVERY_TOKEN = "demo-token-live";
-    private static final long AUTO_STEP_DELAY_MS = 2000;
+    private static final long AUTO_STEP_DELAY_MS = 5000;
 
     private static final String EVENT_START = "start";
     private static final String EVENT_UPDATE = "update";
@@ -47,21 +52,43 @@ public class LiveNotificationDemoActivity extends BaseActivity<ActivityLiveNotif
     private static final String ACTIVITY_TYPE_COUNTDOWN_TIMER = "io.customer.liveactivities.countdowntimer";
     private static final String ACTIVITY_TYPE_AUCTION_BID = "io.customer.liveactivities.auctionbid";
     private static final String ACTIVITY_TYPE_UNKNOWN = "io.customer.liveactivities.bogus";
+    // Custom (app-rendered) types — rendered by LiveNotificationCallback, not an SDK template.
+    private static final String ACTIVITY_TYPE_RIDESHARE = LiveNotificationCallback.ACTIVITY_TYPE_RIDESHARE;
+    private static final String ACTIVITY_TYPE_WORKOUT = LiveNotificationCallback.ACTIVITY_TYPE_WORKOUT;
 
     private enum TemplateChoice {
-        DELIVERY_TRACKING, FLIGHT_STATUS, LIVE_SCORE, COUNTDOWN_TIMER, AUCTION_BID
+        DELIVERY_TRACKING, FLIGHT_STATUS, LIVE_SCORE, COUNTDOWN_TIMER, AUCTION_BID,
+        CUSTOM_RIDESHARE, CUSTOM_WORKOUT
     }
 
+    // Event the backend campaign listens for; its `activity_type` property selects the template.
+    private static final String CAMPAIGN_EVENT = "trigger_live";
+    // Dropdown order must match CAMPAIGN_TEMPLATE_LABELS below.
+    private static final String[] CAMPAIGN_ACTIVITY_TYPES = {
+            ACTIVITY_TYPE_DELIVERY_TRACKING,
+            ACTIVITY_TYPE_FLIGHT_STATUS,
+            ACTIVITY_TYPE_LIVE_SCORE,
+            ACTIVITY_TYPE_COUNTDOWN_TIMER,
+            ACTIVITY_TYPE_AUCTION_BID
+    };
+
     private int currentStep = 0;
     private boolean isActive = false;
     private final Handler autoHandler = new Handler(Looper.getMainLooper());
     private boolean isAutoRunning = false;
+    private int selectedCampaignIndex = 0;
+    private CustomerIORepository customerIORepository;
 
     @Override
     protected ActivityLiveNotificationDemoBinding inflateViewBinding() {
         return ActivityLiveNotificationDemoBinding.inflate(getLayoutInflater());
     }
 
+    @Override
+    protected void injectDependencies() {
+        customerIORepository = applicationGraph.getCustomerIORepository();
+    }
+
     @Override
     protected void setupContent() {
         binding.topAppBar.setNavigationOnClickListener(v -> finish());
@@ -73,6 +100,9 @@ protected void setupContent() {
         binding.unknownActivityTypeButton.setOnClickListener(v -> sendUnknownActivityType());
         binding.apiStartButton.setOnClickListener(v -> startViaApi());
 
+        setupCampaignDropdown();
+        binding.campaignTriggerButton.setOnClickListener(v -> triggerCampaign());
+
         binding.typeRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
             if (isActive) {
                 autoHandler.removeCallbacksAndMessages(null);
@@ -91,13 +121,15 @@ private TemplateChoice getSelectedTemplate() {
         if (checkedId == R.id.radio_live_score) return TemplateChoice.LIVE_SCORE;
         if (checkedId == R.id.radio_countdown_timer) return TemplateChoice.COUNTDOWN_TIMER;
         if (checkedId == R.id.radio_auction_bid) return TemplateChoice.AUCTION_BID;
+        if (checkedId == R.id.radio_custom_rideshare) return TemplateChoice.CUSTOM_RIDESHARE;
+        if (checkedId == R.id.radio_custom_workout) return TemplateChoice.CUSTOM_WORKOUT;
         return TemplateChoice.DELIVERY_TRACKING;
     }
 
     private int getStepCount() {
         switch (getSelectedTemplate()) {
-            // Delivery: ordered → preparing → out-for-delivery → delivered → missing-asset edge case
-            case DELIVERY_TRACKING: return 5;
+            // Delivery: ordered → preparing → out-for-delivery → delivered
+            case DELIVERY_TRACKING: return 4;
             // Flight: pre-departure → boarding → in-flight → arrived → delay-red variant
             case FLIGHT_STATUS: return 5;
             case LIVE_SCORE: return 4;
@@ -105,6 +137,10 @@ private int getStepCount() {
             case COUNTDOWN_TIMER: return 4;
             // Auction: outbid → winning → outbid again → ended → no-userBidAmount variant
             case AUCTION_BID: return 5;
+            // Rideshare (custom RemoteViews): en route → arriving → in trip → dropoff
+            case CUSTOM_RIDESHARE: return 4;
+            // Workout (builder API): warmup → running → final push → cooldown
+            case CUSTOM_WORKOUT: return 4;
             default: return 1;
         }
     }
@@ -165,6 +201,8 @@ private void sendPush(String event, int step) {
             case LIVE_SCORE: sendLiveScore(event, step); break;
             case COUNTDOWN_TIMER: sendCountdownTimer(event, step); break;
             case AUCTION_BID: sendAuctionBid(event, step); break;
+            case CUSTOM_RIDESHARE: sendCustomRideshare(event, step); break;
+            case CUSTOM_WORKOUT: sendCustomWorkout(event, step); break;
         }
     }
 
@@ -173,17 +211,14 @@ private void sendDeliveryTracking(String event, int step) {
                 "Your order has been placed",
                 "Your order is being prepared",
                 "Your order is out for delivery",
-                "Your order has been delivered",
-                "Asset key missing — design-for-absence path"
+                "Your order has been delivered"
         };
-        // Step 4 intentionally points to a key the host app has not bundled, exercising
-        // TemplateAssets.resolveDrawable's "did not resolve" branch.
+        // Distinct icon per step: ordered → preparing → out-for-delivery → delivered.
         String[] imageKeys = {
-                "delivery_warehouse",
-                "delivery_warehouse",
+                "delivery_ordered",
+                "delivery_preparing",
                 "delivery_truck",
-                "delivery_door",
-                "unknown_key"
+                "delivery_delivered"
         };
         JSONObject attributes = new JSONObject();
         JSONObject contentState = new JSONObject();
@@ -307,6 +342,60 @@ private void sendAuctionBid(String event, int step) {
         fire(buildBundle("demo-auction-bid", event, ACTIVITY_TYPE_AUCTION_BID, attributes, contentState));
     }
 
+    // --- Custom (app-rendered) types: rendered by LiveNotificationCallback, not an SDK template ---
+
+    /**
+     * Custom type rendered by the host app through a completely custom RemoteViews
+     * layout (see {@link LiveNotificationCallback}). The SDK has no template for it.
+     */
+    private void sendCustomRideshare(String event, int step) {
+        String[] statuses = {
+                "Heading to your pickup",
+                "Arriving now — look for the car",
+                "On the way to your destination",
+                "You've arrived"
+        };
+        String[] etas = {"6 min", "1 min", "12 min", "Now"};
+        // progress across the 4 stops
+        int[] progress = {15, 40, 80, 100};
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            attributes.put("driverName", "Alex");
+            attributes.put("vehicle", "Toyota Prius");
+            attributes.put("plate", "7XYZ123");
+
+            contentState.put("statusMessage", statuses[step]);
+            contentState.put("etaText", etas[step]);
+            contentState.put("step", step);
+            contentState.put("progress", progress[step]);
+        } catch (JSONException ignored) { }
+        fire(buildBundle("demo-rideshare", event, ACTIVITY_TYPE_RIDESHARE, attributes, contentState));
+    }
+
+    /**
+     * Custom type rendered by the host app via the standard NotificationCompat builder
+     * API (determinate progress + BigTextStyle + action), requesting promoted-ongoing.
+     */
+    private void sendCustomWorkout(String event, int step) {
+        String[] distances = {"0.4 km", "2.4 km", "4.1 km", "5.0 km"};
+        String[] durations = {"02:10", "14:32", "24:48", "30:15"};
+        String[] paces = {"5'25\"/km", "6'03\"/km", "6'02\"/km", "6'03\"/km"};
+        int[] progress = {8, 48, 82, 100};
+        JSONObject attributes = new JSONObject();
+        JSONObject contentState = new JSONObject();
+        try {
+            attributes.put("workoutTitle", "Morning Run");
+
+            contentState.put("distance", distances[step]);
+            contentState.put("duration", durations[step]);
+            contentState.put("pace", paces[step]);
+            contentState.put("step", step);
+            contentState.put("progress", progress[step]);
+        } catch (JSONException ignored) { }
+        fire(buildBundle("demo-workout", event, ACTIVITY_TYPE_WORKOUT, attributes, contentState));
+    }
+
     /**
      * Exercises the public local-start API: the SDK generates the activity id, renders
      * the notification immediately, and registers the instance with the backend.
@@ -327,6 +416,50 @@ private void startViaApi() {
         binding.statusTextView.setText(getString(R.string.live_notification_status_format, "API:" + activityId, 1));
     }
 
+    // --- Campaign trigger ---
+
+    private void setupCampaignDropdown() {
+        String[] labels = {
+                getString(R.string.live_notification_type_delivery_tracking),
+                getString(R.string.live_notification_type_flight_status),
+                getString(R.string.live_notification_type_live_score),
+                getString(R.string.live_notification_type_countdown_timer),
+                getString(R.string.live_notification_type_auction_bid)
+        };
+        ArrayAdapter<String> adapter =
+                new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, labels);
+        binding.campaignTemplateDropdown.setAdapter(adapter);
+        binding.campaignTemplateDropdown.setText(labels[selectedCampaignIndex], false);
+        binding.campaignTemplateDropdown.setOnItemClickListener(
+                (parent, view, position, id) -> selectedCampaignIndex = position);
+    }
+
+    /**
+     * Tracks the {@code trigger_live} event with the selected {@code activity_type} and a
+     * unique {@code timestamp}. A backend campaign listening for this event then pushes the
+     * real start/update/end lifecycle through the live-notification path — no synthetic local
+     * push here.
+     * <p>
+     * The {@code timestamp} property is meant to be injected into the {@code activity_id} of
+     * every payload via Liquid (e.g. {@code "activity_id": "order-{{ event.timestamp }}"}) so
+     * each campaign run gets a fresh activity id. Reusing an activity id across runs would hit
+     * the SDK's out-of-order guard (a prior {@code end} freezes that id's high-water timestamp),
+     * and the new pushes would be dropped as stale.
+     */
+    private void triggerCampaign() {
+        String activityType = CAMPAIGN_ACTIVITY_TYPES[selectedCampaignIndex];
+        Map<String, String> properties = new HashMap<>();
+        properties.put("activity_type", activityType);
+        // Unique per trigger; used by the campaign to build a fresh activity_id via Liquid.
+        properties.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        customerIORepository.trackEvent(CAMPAIGN_EVENT, properties);
+        Snackbar.make(
+                binding.campaignTriggerButton,
+                getString(R.string.live_notification_campaign_event_sent, activityType),
+                Snackbar.LENGTH_SHORT
+        ).show();
+    }
+
     private void sendUnknownActivityType() {
         // Exercises LiveNotificationHandler's "Unknown live notification template" log path.
         JSONObject attributes = new JSONObject();
diff --git a/samples/java_layout/src/main/res/drawable/delivery_delivered.xml b/samples/java_layout/src/main/res/drawable/delivery_delivered.xml
new file mode 100644
index 000000000..35b46a3ff
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/delivery_delivered.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1565C0"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/delivery_ordered.xml b/samples/java_layout/src/main/res/drawable/delivery_ordered.xml
new file mode 100644
index 000000000..be249da86
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/delivery_ordered.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1565C0"
+        android:pathData="M18,17H6v-2h12v2zM18,13H6v-2h12v2zM18,9H6V7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22V2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/delivery_preparing.xml b/samples/java_layout/src/main/res/drawable/delivery_preparing.xml
new file mode 100644
index 000000000..8f404459b
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/delivery_preparing.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1565C0"
+        android:pathData="M20,2H4C3,2 2,2.9 2,4v3.01C2,7.73 2.43,8.35 3,8.7V20c0,1.1 1.1,2 2,2h14c0.9,0 2,-0.9 2,-2V8.7c0.57,-0.35 1,-0.97 1,-1.69V4c0,-1.1 -1,-2 -2,-2zM15,14H9v-2h6v2zM20,7H4V4h16v3z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/ic_rideshare_car.xml b/samples/java_layout/src/main/res/drawable/ic_rideshare_car.xml
new file mode 100644
index 000000000..052fc5cb0
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/ic_rideshare_car.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1B5E20"
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/ic_step_active.xml b/samples/java_layout/src/main/res/drawable/ic_step_active.xml
new file mode 100644
index 000000000..488be8dc5
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/ic_step_active.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1B5E20"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/ic_step_done.xml b/samples/java_layout/src/main/res/drawable/ic_step_done.xml
new file mode 100644
index 000000000..848364a99
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/ic_step_done.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#2E7D32"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/ic_step_pending.xml b/samples/java_layout/src/main/res/drawable/ic_step_pending.xml
new file mode 100644
index 000000000..e3b429513
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/ic_step_pending.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#BDBDBD"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/drawable/ic_workout_run.xml b/samples/java_layout/src/main/res/drawable/ic_workout_run.xml
new file mode 100644
index 000000000..74c362673
--- /dev/null
+++ b/samples/java_layout/src/main/res/drawable/ic_workout_run.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#1B5E20"
+        android:pathData="M13.49,5.48c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM9.89,19.38l1,-4.4 2.1,2v6h2v-7.5l-2.1,-2 0.6,-3c1.3,1.5 3.3,2.5 5.5,2.5v-2c-1.9,0 -3.5,-1 -4.3,-2.4l-1,-1.6c-0.4,-0.6 -1,-1 -1.7,-1 -0.3,0 -0.5,0.1 -0.8,0.1l-5.2,2.2v4.7h2v-3.4l1.8,-0.7 -1.6,8.1 -4.9,-1 -0.4,2 7,1.4z" />
+</vector>
diff --git a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
index 6c1cc4c21..aa634b9ea 100644
--- a/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
+++ b/samples/java_layout/src/main/res/layout/activity_live_notification_demo.xml
@@ -17,13 +17,17 @@
             app:title="@string/live_notification_demo" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <LinearLayout
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="vertical"
-        android:padding="@dimen/margin_default"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:padding="@dimen/margin_default">
 
         <TextView
             android:id="@+id/status_text_view"
@@ -78,6 +82,18 @@
                 android:layout_height="wrap_content"
                 android:text="@string/live_notification_type_auction_bid" />
 
+            <RadioButton
+                android:id="@+id/radio_custom_rideshare"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/live_notification_type_rideshare" />
+
+            <RadioButton
+                android:id="@+id/radio_custom_workout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/live_notification_type_workout" />
+
         </RadioGroup>
 
         <!-- Manual controls -->
@@ -130,6 +146,38 @@
             android:layout_marginTop="@dimen/margin_default"
             android:text="@string/live_notification_auto" />
 
+        <!-- Campaign trigger: tracks a `trigger_activity` event whose `activity_type`
+             property drives a backend campaign that pushes the real start/update/end. -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/live_notification_section_campaign"
+            android:textAppearance="@style/TextAppearance.Material3.LabelLarge" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/campaign_template_layout"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:hint="@string/live_notification_campaign_hint">
+
+            <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                android:id="@+id/campaign_template_dropdown"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="none" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <Button
+            android:id="@+id/campaign_trigger_button"
+            style="?attr/materialButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_default"
+            android:text="@string/live_notification_campaign_trigger" />
+
         <!-- Debug controls -->
         <TextView
             android:layout_width="match_parent"
@@ -155,4 +203,5 @@
             android:text="@string/live_notification_debug_start_via_api" />
 
     </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/samples/java_layout/src/main/res/layout/notification_rideshare_collapsed.xml b/samples/java_layout/src/main/res/layout/notification_rideshare_collapsed.xml
new file mode 100644
index 000000000..49be7b186
--- /dev/null
+++ b/samples/java_layout/src/main/res/layout/notification_rideshare_collapsed.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Custom RemoteViews layout for the app-rendered "rideshare" live notification
+     (collapsed). Driven entirely by the host app via
+     CustomerIOPushNotificationCallback.createLiveNotification. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText"
+            android:text="Alex is on the way" />
+
+        <TextView
+            android:id="@+id/tv_subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="13sp"
+            tools:ignore="HardcodedText"
+            android:text="Toyota Prius · 7XYZ123" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:gravity="end"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:letterSpacing="0.08"
+            android:text="@string/live_notification_rideshare_eta"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="10sp" />
+
+        <TextView
+            android:id="@+id/tv_eta"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#2E7D32"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText"
+            android:text="4 min" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/samples/java_layout/src/main/res/layout/notification_rideshare_expanded.xml b/samples/java_layout/src/main/res/layout/notification_rideshare_expanded.xml
new file mode 100644
index 000000000..ac30aa924
--- /dev/null
+++ b/samples/java_layout/src/main/res/layout/notification_rideshare_expanded.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Custom RemoteViews layout for the app-rendered "rideshare" live notification
+     (expanded). The host app sets every field + the 4-stop progress strip from
+     CustomerIOPushNotificationCallback.createLiveNotification. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="14dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText"
+                android:text="Alex is on the way" />
+
+            <TextView
+                android:id="@+id/tv_subtitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="13sp"
+                tools:ignore="HardcodedText"
+                android:text="Toyota Prius · 7XYZ123" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:gravity="end"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:letterSpacing="0.08"
+                android:text="@string/live_notification_rideshare_eta"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="10sp" />
+
+            <TextView
+                android:id="@+id/tv_eta"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#2E7D32"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText"
+                android:text="4 min" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="13sp"
+        tools:ignore="HardcodedText"
+        android:text="Heading to your pickup" />
+
+    <!-- 4-stop progress strip; the app sets each icon (pending/active/done). -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:orientation="horizontal"
+        android:weightSum="4">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/iv_step1"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:contentDescription="@string/live_notification_rideshare_step_pickup"
+                android:src="@drawable/ic_step_active" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:text="@string/live_notification_rideshare_step_pickup"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/iv_step2"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:contentDescription="@string/live_notification_rideshare_step_arriving"
+                android:src="@drawable/ic_step_pending" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:text="@string/live_notification_rideshare_step_arriving"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/iv_step3"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:contentDescription="@string/live_notification_rideshare_step_trip"
+                android:src="@drawable/ic_step_pending" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:text="@string/live_notification_rideshare_step_trip"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/iv_step4"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:contentDescription="@string/live_notification_rideshare_step_dropoff"
+                android:src="@drawable/ic_step_pending" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:text="@string/live_notification_rideshare_step_dropoff"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="10sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:max="100"
+        android:progress="25"
+        android:progressTint="#2E7D32" />
+</LinearLayout>
diff --git a/samples/java_layout/src/main/res/values/strings.xml b/samples/java_layout/src/main/res/values/strings.xml
index 5c823bcbf..f218add86 100644
--- a/samples/java_layout/src/main/res/values/strings.xml
+++ b/samples/java_layout/src/main/res/values/strings.xml
@@ -166,7 +166,7 @@
     <string name="live_notification_status_idle">Status: Idle</string>
     <string name="live_notification_status_format">Status: %1$s (Step %2$d)</string>
     <string name="live_notification_status_ended">Status: Ended</string>
-    <string name="live_notification_auto">Run All Steps (2s each)</string>
+    <string name="live_notification_auto">Run All Steps (5s each)</string>
     <string name="live_notification_section_type">Notification Type</string>
     <string name="live_notification_section_manual">Manual Control</string>
     <string name="live_notification_section_auto">Auto Sequence</string>
@@ -175,6 +175,17 @@
     <string name="live_notification_type_live_score">Live Score</string>
     <string name="live_notification_type_countdown_timer">Countdown Timer</string>
     <string name="live_notification_type_auction_bid">Auction Bid</string>
+    <string name="live_notification_type_rideshare">Rideshare (custom layout)</string>
+    <string name="live_notification_type_workout">Workout (builder API)</string>
+    <string name="live_notification_rideshare_eta">ETA</string>
+    <string name="live_notification_rideshare_step_pickup">Pickup</string>
+    <string name="live_notification_rideshare_step_arriving">Arriving</string>
+    <string name="live_notification_rideshare_step_trip">In trip</string>
+    <string name="live_notification_rideshare_step_dropoff">Drop-off</string>
+    <string name="live_notification_section_campaign">Trigger via Campaign</string>
+    <string name="live_notification_campaign_hint">Template (activity_type)</string>
+    <string name="live_notification_campaign_trigger">Send trigger_live event</string>
+    <string name="live_notification_campaign_event_sent">Tracked trigger_live: %1$s</string>
     <string name="live_notification_section_debug">Debug</string>
     <string name="live_notification_debug_unknown_activity_type">Fire unknown activity_type</string>
     <string name="live_notification_debug_start_via_api">Start via startLiveNotification() API</string>