From 61069a52d4115d8add31e47469455ed16f70846d Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 11:41:07 -0800
Subject: [PATCH 01/71] add floating button

---
 .../masking/XMLMaskingActivity.kt             | 30 +++++++++++++++++++
 .../res/layout/activity_masking_bench.xml     | 11 +++++++
 2 files changed, 41 insertions(+)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index bbf80dd6c..c45490197 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -7,6 +7,13 @@ import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Toast
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.PopupWindow
+import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
 import com.example.androidobservability.R
@@ -59,6 +66,29 @@ class XMLMaskingActivity : ComponentActivity() {
 		findViewById<Button>(R.id.button_toast).setOnClickListener {
 			Toast.makeText(this, "This is an example toast.", Toast.LENGTH_SHORT).show()
 		}
+		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
+			val messageView = TextView(this).apply {
+				text = "This is a floating popup."
+				setTextColor(Color.BLACK)
+				setPadding(48, 32, 48, 32)
+			}
+			val container = LinearLayout(this).apply {
+				setBackgroundColor(Color.WHITE)
+				elevation = 8f
+				addView(messageView)
+			}
+			val popup = PopupWindow(
+				container,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				true
+			).apply {
+				isOutsideTouchable = true
+				setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+			}
+			val root = findViewById<View>(android.R.id.content)
+			popup.showAtLocation(root, Gravity.CENTER, 0, 0)
+		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)
 		val secondField = findViewById<EditText>(R.id.input_second)
diff --git a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
index dc9b264e0..8d4e1b363 100644
--- a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
+++ b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
@@ -89,6 +89,17 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:text="Toast" />
+
+			<Space
+				android:layout_width="12dp"
+				android:layout_height="1dp" />
+
+			<Button
+				android:id="@+id/button_floating_popup"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="Floating Popup" />
 		</LinearLayout>
 
 		<TextView

From 69799b5f05ccb9f919593e83c36cc0ad93b0601e Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 12:00:55 -0800
Subject: [PATCH 02/71] sample of adding floating views

---
 .../masking/XMLMaskingActivity.kt             | 93 +++++++++++++++----
 1 file changed, 74 insertions(+), 19 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index c45490197..eeaf850f6 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -8,11 +8,12 @@ import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Toast
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
+import android.graphics.PixelFormat
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
-import android.widget.PopupWindow
+import android.view.WindowManager
+import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
@@ -67,27 +68,81 @@ class XMLMaskingActivity : ComponentActivity() {
 			Toast.makeText(this, "This is an example toast.", Toast.LENGTH_SHORT).show()
 		}
 		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
-			val messageView = TextView(this).apply {
-				text = "This is a floating popup."
-				setTextColor(Color.BLACK)
-				setPadding(48, 32, 48, 32)
+			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+
+			// Fullscreen overlay that captures outside taps
+			val overlay = FrameLayout(this).apply {
+				setBackgroundColor(Color.parseColor("#80000000"))
+				isClickable = true
+				isFocusable = true
 			}
-			val container = LinearLayout(this).apply {
+
+			// Centered popup content
+			val content = LinearLayout(this).apply {
+				orientation = LinearLayout.HORIZONTAL
 				setBackgroundColor(Color.WHITE)
-				elevation = 8f
-				addView(messageView)
+				elevation = 12f
+				setPadding(48, 32, 32, 32)
+			}
+
+			val label = TextView(this).apply {
+				text = "UserName"
+				setTextColor(Color.BLACK)
+			}
+
+			val sendButton = ImageButton(this).apply {
+				setImageResource(android.R.drawable.ic_menu_send)
+				contentDescription = "Send"
+				background = null
+			}
+
+			content.addView(label)
+			content.addView(
+				sendButton,
+				LinearLayout.LayoutParams(
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT
+				).apply { leftMargin = 24 }
+			)
+
+			overlay.addView(
+				content,
+				FrameLayout.LayoutParams(
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					Gravity.CENTER
+				)
+			)
+
+			// Dismiss on outside tap
+			overlay.setOnClickListener {
+				try {
+					windowManager.removeView(overlay)
+				} catch (_: Exception) {
+				}
 			}
-			val popup = PopupWindow(
-				container,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				true
-			).apply {
-				isOutsideTouchable = true
-				setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+			// Consume clicks inside content so they don't dismiss
+			content.setOnClickListener { }
+
+			sendButton.setOnClickListener {
+				Toast.makeText(this, "Send clicked", Toast.LENGTH_SHORT).show()
+				try {
+					windowManager.removeView(overlay)
+				} catch (_: Exception) {
+				}
 			}
-			val root = findViewById<View>(android.R.id.content)
-			popup.showAtLocation(root, Gravity.CENTER, 0, 0)
+
+			val params = WindowManager.LayoutParams().apply {
+				width = WindowManager.LayoutParams.MATCH_PARENT
+				height = WindowManager.LayoutParams.MATCH_PARENT
+				format = PixelFormat.TRANSLUCENT
+				flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+				type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
+				token = window.decorView.applicationWindowToken
+				gravity = Gravity.CENTER
+			}
+
+			windowManager.addView(overlay, params)
 		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)

From 81c369f1a5933868065841942cf6955fcc948ddc Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 12:05:03 -0800
Subject: [PATCH 03/71] consolidate in one view

---
 .../masking/XMLMaskingActivity.kt             | 134 ++++++++++--------
 1 file changed, 71 insertions(+), 63 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index eeaf850f6..72e4cd68a 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -1,5 +1,6 @@
 package com.example.androidobservability.masking
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
@@ -70,68 +71,6 @@ class XMLMaskingActivity : ComponentActivity() {
 		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
 			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
 
-			// Fullscreen overlay that captures outside taps
-			val overlay = FrameLayout(this).apply {
-				setBackgroundColor(Color.parseColor("#80000000"))
-				isClickable = true
-				isFocusable = true
-			}
-
-			// Centered popup content
-			val content = LinearLayout(this).apply {
-				orientation = LinearLayout.HORIZONTAL
-				setBackgroundColor(Color.WHITE)
-				elevation = 12f
-				setPadding(48, 32, 32, 32)
-			}
-
-			val label = TextView(this).apply {
-				text = "UserName"
-				setTextColor(Color.BLACK)
-			}
-
-			val sendButton = ImageButton(this).apply {
-				setImageResource(android.R.drawable.ic_menu_send)
-				contentDescription = "Send"
-				background = null
-			}
-
-			content.addView(label)
-			content.addView(
-				sendButton,
-				LinearLayout.LayoutParams(
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					ViewGroup.LayoutParams.WRAP_CONTENT
-				).apply { leftMargin = 24 }
-			)
-
-			overlay.addView(
-				content,
-				FrameLayout.LayoutParams(
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					Gravity.CENTER
-				)
-			)
-
-			// Dismiss on outside tap
-			overlay.setOnClickListener {
-				try {
-					windowManager.removeView(overlay)
-				} catch (_: Exception) {
-				}
-			}
-			// Consume clicks inside content so they don't dismiss
-			content.setOnClickListener { }
-
-			sendButton.setOnClickListener {
-				Toast.makeText(this, "Send clicked", Toast.LENGTH_SHORT).show()
-				try {
-					windowManager.removeView(overlay)
-				} catch (_: Exception) {
-				}
-			}
-
 			val params = WindowManager.LayoutParams().apply {
 				width = WindowManager.LayoutParams.MATCH_PARENT
 				height = WindowManager.LayoutParams.MATCH_PARENT
@@ -142,7 +81,19 @@ class XMLMaskingActivity : ComponentActivity() {
 				gravity = Gravity.CENTER
 			}
 
-			windowManager.addView(overlay, params)
+			val popupView = FloatingPopupView(this).apply {
+				onSendClicked = {
+					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
+				}
+				onDismissRequested = {
+					try {
+						windowManager.removeView(this)
+					} catch (_: Exception) {
+					}
+				}
+			}
+
+			windowManager.addView(popupView, params)
 		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)
@@ -156,4 +107,61 @@ class XMLMaskingActivity : ComponentActivity() {
 	}
 }
 
+class FloatingPopupView(context: Context) : FrameLayout(context) {
+
+	var onSendClicked: (() -> Unit)? = null
+	var onDismissRequested: (() -> Unit)? = null
+
+	init {
+		setBackgroundColor(Color.parseColor("#80000000"))
+		isClickable = true
+		isFocusable = true
+
+		val content = LinearLayout(context).apply {
+			orientation = LinearLayout.HORIZONTAL
+			setBackgroundColor(Color.WHITE)
+			elevation = 12f
+			setPadding(48, 32, 32, 32)
+		}
+
+		val label = TextView(context).apply {
+			text = "UserName"
+			setTextColor(Color.BLACK)
+		}
+
+		val sendButton = ImageButton(context).apply {
+			setImageResource(android.R.drawable.ic_menu_send)
+			contentDescription = "Send"
+			background = null
+		}
+
+		content.addView(label)
+		content.addView(
+			sendButton,
+			LinearLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT
+			).apply { leftMargin = 24 }
+		)
+
+		addView(
+			content,
+			FrameLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				Gravity.CENTER
+			)
+		)
+
+		// Outside tap dismiss
+		setOnClickListener { onDismissRequested?.invoke() }
+		// Consume inner content clicks
+		content.setOnClickListener { }
+		sendButton.setOnClickListener {
+			onSendClicked?.invoke()
+			onDismissRequested?.invoke()
+		}
+	}
+}
+
 

From 8b0c65028a2942138cb716e9a3c8741188ab41ed Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:09:12 -0800
Subject: [PATCH 04/71] use Canvas for certain types of windows

---
 .../replay/capture/CaptureSource.kt           | 10 ++++---
 .../replay/capture/WindowEntry.kt             | 26 ++++++++++++++++++-
 .../replay/capture/WindowInspector.kt         |  3 +--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 1923f0f4d..fcbb6a015 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -142,7 +142,8 @@ class CaptureSource(
 
     private fun pickBaseWindow(windowsEntries: List<WindowEntry>): WindowEntry? {
         windowsEntries.firstOrNull {
-            (it.wmType == TYPE_APPLICATION || it.wmType == TYPE_BASE_APPLICATION)
+            val wmType = it.layoutParams?.type ?: 0
+            (wmType == TYPE_APPLICATION || wmType == TYPE_BASE_APPLICATION)
         }?.let { return it }
 
         windowsEntries.firstOrNull { it.type == WindowType.ACTIVITY }?.let { return it }
@@ -161,10 +162,13 @@ class CaptureSource(
 
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
         val view = windowEntry.rootView
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+        if (windowEntry.isPixelCopyCandidate()) {
             val window = windowInspector.findWindow(view)
             if (window != null) {
-                pixelCopy(window, view, windowEntry.rect())?.let { return it }
+                pixelCopy(window, view, windowEntry.rect())?.let {
+                    return it
+                }
             }
         }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
index 55ca5efc1..0deaada1a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
@@ -1,7 +1,11 @@
 package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Rect
+import android.os.Build
+import android.text.Layout
 import android.view.View
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
 
 
 enum class WindowType {
@@ -13,7 +17,7 @@ enum class WindowType {
 data class WindowEntry(
     val rootView: View,
     var type: WindowType,
-    val wmType: Int,
+    val layoutParams: WindowManager.LayoutParams?,
     val width: Int,
     val height: Int,
     val screenLeft: Int,
@@ -22,6 +26,26 @@ data class WindowEntry(
     fun rect(): Rect {
         return Rect(0, 0, width, height)
     }
+
+    fun isPixelCopyCandidate(): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return false
+        }
+        if (type != WindowType.ACTIVITY) {
+            return false
+        }
+
+        if (layoutParams?.type == TYPE_APPLICATION_STARTING) { // Starting/Splash screen
+            return false
+        }
+
+        if (((layoutParams?.flags ?: 0) and WindowManager.LayoutParams.FLAG_SECURE) != 0) {
+            // Secure window
+            return false
+        }
+
+        return true
+    }
 }
 
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 13450b05a..3152cebc2 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -33,7 +33,7 @@ class WindowInspector(private val logger: LDLogger) {
             WindowEntry(
                 rootView = view,
                 type = determineWindowType(wmType),
-                wmType = wmType,
+                layoutParams = layoutParams,
                 width = view.width,
                 height = view.height,
                 screenLeft = loc[0],
@@ -145,7 +145,6 @@ class WindowInspector(private val logger: LDLogger) {
             WindowManager.LayoutParams.TYPE_APPLICATION,
             WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
             WindowManager.LayoutParams.TYPE_APPLICATION_STARTING -> WindowType.ACTIVITY
-
             WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG -> WindowType.DIALOG
 
             else -> WindowType.OTHER

From 6dafcb3a0a2ab5ba94c72ceb35009d7a5956978b Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:12:10 -0800
Subject: [PATCH 05/71] space

---
 .../launchdarkly/observability/replay/capture/WindowInspector.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 3152cebc2..30b40b18a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -145,6 +145,7 @@ class WindowInspector(private val logger: LDLogger) {
             WindowManager.LayoutParams.TYPE_APPLICATION,
             WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
             WindowManager.LayoutParams.TYPE_APPLICATION_STARTING -> WindowType.ACTIVITY
+
             WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG -> WindowType.DIALOG
 
             else -> WindowType.OTHER

From 04b4c757603b65ca7745dcf3c574bce890683c01 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:25:20 -0800
Subject: [PATCH 06/71] Attached dialog sample

---
 .../masking/XMLMaskingActivity.kt             | 59 ++++++++++++++++---
 .../res/layout/activity_masking_bench.xml     | 11 ++++
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index 72e4cd68a..a5fa74def 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -81,7 +81,36 @@ class XMLMaskingActivity : ComponentActivity() {
 				gravity = Gravity.CENTER
 			}
 
-			val popupView = FloatingPopupView(this).apply {
+			val popupView = FloatingPopupView(this, "Floating Popup").apply {
+				onSendClicked = {
+					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
+				}
+				onDismissRequested = {
+					try {
+						windowManager.removeView(this)
+					} catch (_: Exception) {
+					}
+				}
+			}
+
+			windowManager.addView(popupView, params)
+		}
+
+		findViewById<Button>(R.id.button_attached_dialog).setOnClickListener {
+			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+
+			val params = WindowManager.LayoutParams().apply {
+				width = WindowManager.LayoutParams.MATCH_PARENT
+				height = WindowManager.LayoutParams.MATCH_PARENT
+				format = PixelFormat.TRANSLUCENT
+				flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+				type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG
+				// Attach to this window so it behaves like an attached dialog
+				token = window.decorView.windowToken
+				gravity = Gravity.CENTER
+			}
+
+			val popupView = FloatingPopupView(this, "Attached Dialog").apply {
 				onSendClicked = {
 					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
 				}
@@ -107,7 +136,7 @@ class XMLMaskingActivity : ComponentActivity() {
 	}
 }
 
-class FloatingPopupView(context: Context) : FrameLayout(context) {
+class FloatingPopupView(context: Context, private val headerTitle: String) : FrameLayout(context) {
 
 	var onSendClicked: (() -> Unit)? = null
 	var onDismissRequested: (() -> Unit)? = null
@@ -117,13 +146,24 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 		isClickable = true
 		isFocusable = true
 
-		val content = LinearLayout(context).apply {
-			orientation = LinearLayout.HORIZONTAL
+		// White card container with vertical layout to host header and row
+		val contentContainer = LinearLayout(context).apply {
+			orientation = LinearLayout.VERTICAL
 			setBackgroundColor(Color.WHITE)
 			elevation = 12f
 			setPadding(48, 32, 32, 32)
 		}
 
+		val header = TextView(context).apply {
+			text = headerTitle
+			setTextColor(Color.BLACK)
+			textSize = 16f
+		}
+
+		val row = LinearLayout(context).apply {
+			orientation = LinearLayout.HORIZONTAL
+		}
+
 		val label = TextView(context).apply {
 			text = "UserName"
 			setTextColor(Color.BLACK)
@@ -135,8 +175,8 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 			background = null
 		}
 
-		content.addView(label)
-		content.addView(
+		row.addView(label)
+		row.addView(
 			sendButton,
 			LinearLayout.LayoutParams(
 				ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -144,8 +184,11 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 			).apply { leftMargin = 24 }
 		)
 
+		contentContainer.addView(header)
+		contentContainer.addView(row)
+
 		addView(
-			content,
+			contentContainer,
 			FrameLayout.LayoutParams(
 				ViewGroup.LayoutParams.WRAP_CONTENT,
 				ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -156,7 +199,7 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 		// Outside tap dismiss
 		setOnClickListener { onDismissRequested?.invoke() }
 		// Consume inner content clicks
-		content.setOnClickListener { }
+		contentContainer.setOnClickListener { }
 		sendButton.setOnClickListener {
 			onSendClicked?.invoke()
 			onDismissRequested?.invoke()
diff --git a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
index 8d4e1b363..840aa2d0f 100644
--- a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
+++ b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
@@ -100,6 +100,17 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:text="Floating Popup" />
+
+			<Space
+				android:layout_width="12dp"
+				android:layout_height="1dp" />
+
+			<Button
+				android:id="@+id/button_attached_dialog"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="Attached Dialog" />
 		</LinearLayout>
 
 		<TextView

From 55b00a78a8e4c96c00cfab29357417eab0bddae3 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 09:05:26 -0800
Subject: [PATCH 07/71] no message

---
 .../replay/capture/CaptureSource.kt           |   9 ++
 .../replay/capture/TiledSignature.kt          | 104 ++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 1923f0f4d..35f51a240 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -59,6 +59,9 @@ class CaptureSource(
         style = Paint.Style.FILL
     }
 
+    private val tiledSignatureManager = TiledSignatureManager()
+    @Volatile
+    private var tiledSignature: TiledSignature? = null
     /**
      * Requests a [CaptureEvent] be taken now.
      */
@@ -136,6 +139,12 @@ class CaptureSource(
                     }
                 }
 
+                val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
+                if (newSignature != null && newSignature == tiledSignature) {
+                    return@withContext null
+                }
+                tiledSignature = newSignature
+
                 createCaptureEvent(baseResult.bitmap, rect, timestamp, session)
             }
         }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
new file mode 100644
index 000000000..98c71ec79
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
@@ -0,0 +1,104 @@
+package com.launchdarkly.observability.replay.capture
+
+import android.graphics.Bitmap
+
+data class TiledSignature(
+    val tileHashes: LongArray
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as TiledSignature
+
+        if (!tileHashes.contentEquals(other.tileHashes)) {
+            return false
+        }
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return tileHashes.contentHashCode()
+    }
+}
+
+class TiledSignatureManager {
+    var pixelBuffer: IntArray = IntArray(0)
+    var tileHashesBuffer: LongArray = LongArray(0)
+
+    fun compute(
+        bitmap: Bitmap,
+        tileSize: Int
+    ): TiledSignature? {
+        val width = bitmap.width
+        val height = bitmap.height
+        if (width <= 0 || height <= 0) {
+            return null
+        }
+
+        val pixelsNeeded = width * height
+        if (pixelBuffer.size < pixelsNeeded) {
+            pixelBuffer = IntArray(pixelsNeeded)
+        }
+        val pixels = pixelBuffer
+        bitmap.getPixels(pixels, 0, width, 0, 0, width, height)
+
+        val tilesX = (width + tileSize - 1) / tileSize
+        val tilesY = (width + tileSize - 1) / tileSize
+        val tileCount = tilesX * tilesY
+
+        if (tileHashesBuffer.size < tileCount) {
+            tileHashesBuffer = LongArray(tileCount)
+        }
+
+        val tileHashes = tileHashesBuffer.copyOf()
+
+        var tileIndex = 0
+        for(ty in 0 until tilesY) {
+            val startY = ty * tileSize
+            val endY = minOf(startY + tileSize, height)
+
+            for(tx in 0 until tilesX) {
+                val startX = tx * tileSize
+                val endX = minOf(startX + tileSize, width)
+                tileHashes[tileIndex] = hashTile(
+                    pixels = pixels,
+                    width = width,
+                    startX = startX,
+                    startY = startY,
+                    endX = endX,
+                    endY = endY
+                )
+                tileIndex++
+            }
+        }
+
+        return TiledSignature(tileHashes)
+    }
+
+    private fun hashTile(
+        pixels: IntArray,
+        width: Int,
+        startX: Int,
+        startY: Int,
+        endX: Int,
+        endY: Int
+    ): Long {
+        var hash: Long = 5163949831757626579
+        val prime: Long = 1238197591667094937 // from https://bigprimes.org
+        for(y in startY until endY) {
+            val rowOffset = y * width
+            for(x in startX until endX) {
+                val argb = pixels[rowOffset + x]
+                hash = (hash xor (argb and 0xFF).toLong()) * prime
+                hash = (hash xor ((argb ushr 8) and 0xFF).toLong()) * prime
+                hash = (hash xor ((argb ushr 16) and 0xFF).toLong()) * prime
+                hash = (hash xor ((argb ushr 24) and 0xFF).toLong()) * prime
+            }
+        }
+        return hash
+    }
+}
+
+

From 8ddba2461ec2c5a5edf0683784d6fd1c65e68873 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 09:23:30 -0800
Subject: [PATCH 08/71] fix size bug

---
 .../observability/replay/capture/TiledSignature.kt   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
index 98c71ec79..ee3cd4fa1 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
@@ -24,13 +24,14 @@ data class TiledSignature(
 }
 
 class TiledSignatureManager {
-    var pixelBuffer: IntArray = IntArray(0)
-    var tileHashesBuffer: LongArray = LongArray(0)
+    private var pixelBuffer: IntArray = IntArray(0)
+    private var tileHashesBuffer: LongArray = LongArray(0)
 
     fun compute(
         bitmap: Bitmap,
         tileSize: Int
     ): TiledSignature? {
+        if (tileSize <= 0) return null
         val width = bitmap.width
         val height = bitmap.height
         if (width <= 0 || height <= 0) {
@@ -45,14 +46,14 @@ class TiledSignatureManager {
         bitmap.getPixels(pixels, 0, width, 0, 0, width, height)
 
         val tilesX = (width + tileSize - 1) / tileSize
-        val tilesY = (width + tileSize - 1) / tileSize
+        val tilesY = (height + tileSize - 1) / tileSize
         val tileCount = tilesX * tilesY
 
         if (tileHashesBuffer.size < tileCount) {
             tileHashesBuffer = LongArray(tileCount)
         }
 
-        val tileHashes = tileHashesBuffer.copyOf()
+        val tileHashes = tileHashesBuffer
 
         var tileIndex = 0
         for(ty in 0 until tilesY) {
@@ -74,7 +75,8 @@ class TiledSignatureManager {
             }
         }
 
-        return TiledSignature(tileHashes)
+        //TODO: optimize memory allocations here to have 2 arrays instead of 1
+        return TiledSignature(tileHashes.copyOf())
     }
 
     private fun hashTile(

From 008a41480f0b2b7f061f3e9a85d961ac56cca8a1 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 09:34:41 -0800
Subject: [PATCH 09/71] Recycle bitmap early

---
 .../launchdarkly/observability/replay/capture/CaptureSource.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 35f51a240..71379f549 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -141,6 +141,7 @@ class CaptureSource(
 
                 val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
                 if (newSignature != null && newSignature == tiledSignature) {
+                    baseResult.bitmap.recycle()
                     return@withContext null
                 }
                 tiledSignature = newSignature

From 4d5536bfbc23c0095f5cfdc4194e45abbb8e240e Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 10:11:16 -0800
Subject: [PATCH 10/71] Fix feedback

---
 .../observability/replay/capture/TiledSignature.kt     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
index ee3cd4fa1..3d7edba7a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
@@ -25,7 +25,6 @@ data class TiledSignature(
 
 class TiledSignatureManager {
     private var pixelBuffer: IntArray = IntArray(0)
-    private var tileHashesBuffer: LongArray = LongArray(0)
 
     fun compute(
         bitmap: Bitmap,
@@ -48,12 +47,7 @@ class TiledSignatureManager {
         val tilesX = (width + tileSize - 1) / tileSize
         val tilesY = (height + tileSize - 1) / tileSize
         val tileCount = tilesX * tilesY
-
-        if (tileHashesBuffer.size < tileCount) {
-            tileHashesBuffer = LongArray(tileCount)
-        }
-
-        val tileHashes = tileHashesBuffer
+        val tileHashes = LongArray(tileCount)
 
         var tileIndex = 0
         for(ty in 0 until tilesY) {
@@ -76,7 +70,7 @@ class TiledSignatureManager {
         }
 
         //TODO: optimize memory allocations here to have 2 arrays instead of 1
-        return TiledSignature(tileHashes.copyOf())
+        return TiledSignature(tileHashes)
     }
 
     private fun hashTile(

From ce45b4200de4e62bcc2d9994b70e05a06e42f2cb Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 12:11:33 -0800
Subject: [PATCH 11/71] address feedback

---
 .../replay/capture/TiledSignature.kt          | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
index 3d7edba7a..c81755362 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
@@ -5,27 +5,31 @@ import android.graphics.Bitmap
 data class TiledSignature(
     val tileHashes: LongArray
 ) {
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TiledSignature
-
-        if (!tileHashes.contentEquals(other.tileHashes)) {
-            return false
-        }
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return tileHashes.contentHashCode()
-    }
+    override fun equals(other: Any?): Boolean = 
+        other is TiledSignature && tileHashes.contentEquals(other.tileHashes)
+    
+        override fun hashCode(): Int = tileHashes.contentHashCode()
 }
 
+/**
+ * Computes tiled signatures for bitmaps.
+ *
+ * This class is intentionally not thread-safe in order to reuse a single internal
+ * pixel buffer allocation and minimize memory churn and GC pressure. Do not invoke
+ * methods on the same instance from multiple threads concurrently. If cross-thread
+ * use is required, create one instance per thread or guard access with external
+ * synchronization.
+ */
 class TiledSignatureManager {
     private var pixelBuffer: IntArray = IntArray(0)
 
+/**
+ * Computes a tiled signature for the given bitmap. Not thread-safe.
+ *
+ * @param bitmap The bitmap to compute a signature for.
+ * @param tileSize The size of the tiles to use for the signature.
+ * @return The tiled signature.
+ */
     fun compute(
         bitmap: Bitmap,
         tileSize: Int
@@ -81,8 +85,8 @@ class TiledSignatureManager {
         endX: Int,
         endY: Int
     ): Long {
-        var hash: Long = 5163949831757626579
-        val prime: Long = 1238197591667094937 // from https://bigprimes.org
+        var hash = 5163949831757626579L
+        val prime = 1238197591667094937L // from https://bigprimes.org
         for(y in startY until endY) {
             val rowOffset = y * width
             for(x in startX until endX) {
@@ -96,5 +100,3 @@ class TiledSignatureManager {
         return hash
     }
 }
-
-

From 50aee557522a51556be323f5ce17fb22286e208c Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 12:40:50 -0800
Subject: [PATCH 12/71] Volatile

---
 .../launchdarkly/observability/replay/capture/TiledSignature.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
index c81755362..48b9f85d2 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/TiledSignature.kt
@@ -21,6 +21,7 @@ data class TiledSignature(
  * synchronization.
  */
 class TiledSignatureManager {
+    @Volatile
     private var pixelBuffer: IntArray = IntArray(0)
 
 /**

From 04c252ebce47fcd8ef5313bb7c9eec2976655442 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 12:45:35 -0800
Subject: [PATCH 13/71] Unit tests

---
 .../replay/capture/CaptureSource.kt           |   1 +
 .../capture/TiledSignatureManagerTest.kt      | 122 ++++++++++++++++++
 .../observability/testutil/BitmapMocks.kt     |  83 ++++++++++++
 3 files changed, 206 insertions(+)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/TiledSignatureManagerTest.kt
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/testutil/BitmapMocks.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 71379f549..b6f3e9c7c 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -142,6 +142,7 @@ class CaptureSource(
                 val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
                 if (newSignature != null && newSignature == tiledSignature) {
                     baseResult.bitmap.recycle()
+                    // the similar bitmap not send
                     return@withContext null
                 }
                 tiledSignature = newSignature
diff --git a/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/TiledSignatureManagerTest.kt b/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/TiledSignatureManagerTest.kt
new file mode 100644
index 000000000..faa7a7a0f
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/TiledSignatureManagerTest.kt
@@ -0,0 +1,122 @@
+package com.launchdarkly.observability.replay.capture
+
+import com.launchdarkly.observability.testutil.mockBitmap
+import com.launchdarkly.observability.testutil.withOverlayRect
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+
+class TiledSignatureManagerTest {
+
+    private val RED = 0xFFFF0000.toInt()
+    private val BLUE = 0xFF0000FF.toInt()
+    private val WHITE = 0xFFFFFFFF.toInt()
+    private fun solidPixels(width: Int, height: Int, color: Int): IntArray {
+        val pixels = IntArray(width * height)
+        java.util.Arrays.fill(pixels, color)
+        return pixels
+    }
+
+    @Test
+    fun compute_returnsNull_whenTileSizeNonPositive() {
+        val manager = TiledSignatureManager()
+        val bitmap = mockBitmap(2, 2, RED)
+
+        assertNull(manager.compute(bitmap, 0))
+        assertNull(manager.compute(bitmap, -8))
+    }
+
+    @Test
+    fun compute_returnsSignature_whenValidInputs() {
+        val manager = TiledSignatureManager()
+        val bitmap = mockBitmap(4, 4, BLUE)
+
+        val signature = manager.compute(bitmap, 2)
+        assertNotNull(signature)
+        // 4x4 with tileSize 2 => 2x2 = 4 tiles
+        assertEquals(4, signature!!.tileHashes.size)
+    }
+
+    @Test
+    fun signatures_equal_forIdenticalContent() {
+        val manager = TiledSignatureManager()
+        val a = mockBitmap(8, 8, BLUE)
+        val b = mockBitmap(8, 8, BLUE)
+
+        val sigA = manager.compute(a, 4)
+        val sigB = manager.compute(b, 4)
+
+        assertNotNull(sigA)
+        assertNotNull(sigB)
+        assertEquals(sigA, sigB)
+    }
+
+    @Test
+    fun signatures_differ_forDifferentContent() {
+        val manager = TiledSignatureManager()
+        val a = mockBitmap(8, 8, RED)
+        val b = mockBitmap(8, 8, WHITE)
+
+        val sigA = manager.compute(a, 4)
+        val sigB = manager.compute(b, 4)
+
+        assertNotNull(sigA)
+        assertNotNull(sigB)
+        assertNotEquals(sigA, sigB)
+    }
+
+    @Test
+    fun tileCount_matchesExpectedCeilDivision() {
+        val manager = TiledSignatureManager()
+        val bmp = mockBitmap(10, 10, RED)
+
+        // tileSize 4 => ceil(10/4)=3 in each dimension => 9 tiles
+        val sig4 = manager.compute(bmp, 4)
+        assertNotNull(sig4)
+        assertEquals(9, sig4!!.tileHashes.size)
+
+        // tileSize 6 => ceil(10/6)=2 in each dimension => 4 tiles
+        val sig6 = manager.compute(bmp, 6)
+        assertNotNull(sig6)
+        assertEquals(4, sig6!!.tileHashes.size)
+    }
+
+    @Test
+    fun smallOverlay_changesOnlyAffectedTiles_hashes() {
+        val manager = TiledSignatureManager()
+        val width = 12
+        val height = 12
+        val basePixels = solidPixels(width, height, WHITE)
+        val overlayPixels = withOverlayRect(
+            basePixels = basePixels,
+            imageWidth = width,
+            imageHeight = height,
+            color = RED,
+            left = 8,   // touches only the last column of tiles for tileSize=4
+            top = 8,    // touches only the last row of tiles for tileSize=4
+            right = 12,
+            bottom = 12
+        )
+        val base = mockBitmap(width, height, basePixels)
+        val withOverlay = mockBitmap(width, height, overlayPixels)
+
+        val tileSize = 4
+        val sigBase = manager.compute(base, tileSize)!!
+        val sigOverlay = manager.compute(withOverlay, tileSize)!!
+
+        // 12x12 with tile size 4 => 3x3 tiles
+        assertEquals(9, sigBase.tileHashes.size)
+        assertEquals(9, sigOverlay.tileHashes.size)
+
+        var diffCount = 0
+        for (i in sigBase.tileHashes.indices) {
+            if (sigBase.tileHashes[i] != sigOverlay.tileHashes[i]) {
+                diffCount++
+            }
+        }
+        org.junit.jupiter.api.Assertions.assertNotEquals(0, diffCount)
+    }
+}
+
diff --git a/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/testutil/BitmapMocks.kt b/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/testutil/BitmapMocks.kt
new file mode 100644
index 000000000..1eed604ba
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/testutil/BitmapMocks.kt
@@ -0,0 +1,83 @@
+package com.launchdarkly.observability.testutil
+
+import android.graphics.Bitmap
+import io.mockk.every
+import io.mockk.mockk
+
+/**
+ * Creates a MockK-based fake Android Bitmap that returns the provided width/height
+ * and serves pixels from the given [pixels] array via getPixels.
+ *
+ * The [pixels] array must be of size width * height, in row-major order (left-to-right, top-to-bottom).
+ */
+fun mockBitmap(imageWidth: Int, imageHeight: Int, pixels: IntArray): Bitmap {
+    require(imageWidth > 0 && imageHeight > 0) { "imageWidth and imageHeight must be positive." }
+    require(pixels.size == imageWidth * imageHeight) {
+        "pixels size ${pixels.size} must equal imageWidth*imageHeight=${imageWidth * imageHeight}"
+    }
+
+    val bmp = mockk<Bitmap>()
+
+    every { bmp.width } returns imageWidth
+    every { bmp.height } returns imageHeight
+    every { bmp.getPixels(any(), any(), any(), any(), any(), any(), any()) } answers {
+        val dest = invocation.args[0] as IntArray
+        val offset = invocation.args[1] as Int
+        val stride = invocation.args[2] as Int
+        val x = invocation.args[3] as Int
+        val y = invocation.args[4] as Int
+        val w = invocation.args[5] as Int
+        val h = invocation.args[6] as Int
+
+        for (row in 0 until h) {
+            val srcRowStart = (y + row) * imageWidth + x
+            val dstRowStart = offset + row * stride
+            for (col in 0 until w) {
+                dest[dstRowStart + col] = pixels[srcRowStart + col]
+            }
+        }
+        Unit
+    }
+
+    return bmp
+}
+
+/**
+ * Returns a copy of [basePixels] with a filled rectangle overlay applied.
+ *
+ * The rectangle is defined by [left], [top], [right], [bottom] in pixel coordinates and is
+ * clamped to the image bounds defined by [imageWidth] and [imageHeight].
+ */
+fun withOverlayRect(
+    basePixels: IntArray,
+    imageWidth: Int,
+    imageHeight: Int,
+    color: Int,
+    left: Int,
+    top: Int,
+    right: Int,
+    bottom: Int
+): IntArray {
+    val out = basePixels.clone()
+    val clampedLeft = left.coerceIn(0, imageWidth)
+    val clampedTop = top.coerceIn(0, imageHeight)
+    val clampedRight = right.coerceIn(0, imageWidth)
+    val clampedBottom = bottom.coerceIn(0, imageHeight)
+    for (y in clampedTop until clampedBottom) {
+        val rowStart = y * imageWidth
+        for (x in clampedLeft until clampedRight) {
+            out[rowStart + x] = color
+        }
+    }
+    return out
+}
+
+/**
+ * Convenience overload to create a solid-color mock Bitmap.
+ */
+fun mockBitmap(imageWidth: Int, imageHeight: Int, color: Int): Bitmap {
+    val pixels = IntArray(imageWidth * imageHeight) { color }
+    return mockBitmap(imageWidth, imageHeight, pixels)
+}
+
+

From 54f08defffb6d78034fe51f763d3968654f83887 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 14:03:15 -0800
Subject: [PATCH 14/71] create Mask

---
 .../com/launchdarkly/observability/replay/masking/Mask.kt  | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
new file mode 100644
index 000000000..3a59b4ca0
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
@@ -0,0 +1,7 @@
+package com.launchdarkly.observability.replay.masking
+import androidx.compose.ui.geometry.Rect
+
+data class Mask(
+    val rect: Rect
+)
+

From d6fd3784a22e334e3cd5bc2a45f7bf762cbb8d70 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 11:41:07 -0800
Subject: [PATCH 15/71] add floating button

---
 .../masking/XMLMaskingActivity.kt             | 30 +++++++++++++++++++
 .../res/layout/activity_masking_bench.xml     | 11 +++++++
 2 files changed, 41 insertions(+)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index bbf80dd6c..c45490197 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -7,6 +7,13 @@ import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Toast
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.PopupWindow
+import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
 import com.example.androidobservability.R
@@ -59,6 +66,29 @@ class XMLMaskingActivity : ComponentActivity() {
 		findViewById<Button>(R.id.button_toast).setOnClickListener {
 			Toast.makeText(this, "This is an example toast.", Toast.LENGTH_SHORT).show()
 		}
+		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
+			val messageView = TextView(this).apply {
+				text = "This is a floating popup."
+				setTextColor(Color.BLACK)
+				setPadding(48, 32, 48, 32)
+			}
+			val container = LinearLayout(this).apply {
+				setBackgroundColor(Color.WHITE)
+				elevation = 8f
+				addView(messageView)
+			}
+			val popup = PopupWindow(
+				container,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				true
+			).apply {
+				isOutsideTouchable = true
+				setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+			}
+			val root = findViewById<View>(android.R.id.content)
+			popup.showAtLocation(root, Gravity.CENTER, 0, 0)
+		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)
 		val secondField = findViewById<EditText>(R.id.input_second)
diff --git a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
index dc9b264e0..8d4e1b363 100644
--- a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
+++ b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
@@ -89,6 +89,17 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:text="Toast" />
+
+			<Space
+				android:layout_width="12dp"
+				android:layout_height="1dp" />
+
+			<Button
+				android:id="@+id/button_floating_popup"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="Floating Popup" />
 		</LinearLayout>
 
 		<TextView

From 59c2f6de9abdeb4e1b81ff7dc7812ce0d58dc6de Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 12:00:55 -0800
Subject: [PATCH 16/71] sample of adding floating views

---
 .../masking/XMLMaskingActivity.kt             | 93 +++++++++++++++----
 1 file changed, 74 insertions(+), 19 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index c45490197..eeaf850f6 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -8,11 +8,12 @@ import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Toast
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
+import android.graphics.PixelFormat
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
-import android.widget.PopupWindow
+import android.view.WindowManager
+import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
@@ -67,27 +68,81 @@ class XMLMaskingActivity : ComponentActivity() {
 			Toast.makeText(this, "This is an example toast.", Toast.LENGTH_SHORT).show()
 		}
 		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
-			val messageView = TextView(this).apply {
-				text = "This is a floating popup."
-				setTextColor(Color.BLACK)
-				setPadding(48, 32, 48, 32)
+			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+
+			// Fullscreen overlay that captures outside taps
+			val overlay = FrameLayout(this).apply {
+				setBackgroundColor(Color.parseColor("#80000000"))
+				isClickable = true
+				isFocusable = true
 			}
-			val container = LinearLayout(this).apply {
+
+			// Centered popup content
+			val content = LinearLayout(this).apply {
+				orientation = LinearLayout.HORIZONTAL
 				setBackgroundColor(Color.WHITE)
-				elevation = 8f
-				addView(messageView)
+				elevation = 12f
+				setPadding(48, 32, 32, 32)
+			}
+
+			val label = TextView(this).apply {
+				text = "UserName"
+				setTextColor(Color.BLACK)
+			}
+
+			val sendButton = ImageButton(this).apply {
+				setImageResource(android.R.drawable.ic_menu_send)
+				contentDescription = "Send"
+				background = null
+			}
+
+			content.addView(label)
+			content.addView(
+				sendButton,
+				LinearLayout.LayoutParams(
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT
+				).apply { leftMargin = 24 }
+			)
+
+			overlay.addView(
+				content,
+				FrameLayout.LayoutParams(
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					Gravity.CENTER
+				)
+			)
+
+			// Dismiss on outside tap
+			overlay.setOnClickListener {
+				try {
+					windowManager.removeView(overlay)
+				} catch (_: Exception) {
+				}
 			}
-			val popup = PopupWindow(
-				container,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				true
-			).apply {
-				isOutsideTouchable = true
-				setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+			// Consume clicks inside content so they don't dismiss
+			content.setOnClickListener { }
+
+			sendButton.setOnClickListener {
+				Toast.makeText(this, "Send clicked", Toast.LENGTH_SHORT).show()
+				try {
+					windowManager.removeView(overlay)
+				} catch (_: Exception) {
+				}
 			}
-			val root = findViewById<View>(android.R.id.content)
-			popup.showAtLocation(root, Gravity.CENTER, 0, 0)
+
+			val params = WindowManager.LayoutParams().apply {
+				width = WindowManager.LayoutParams.MATCH_PARENT
+				height = WindowManager.LayoutParams.MATCH_PARENT
+				format = PixelFormat.TRANSLUCENT
+				flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+				type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
+				token = window.decorView.applicationWindowToken
+				gravity = Gravity.CENTER
+			}
+
+			windowManager.addView(overlay, params)
 		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)

From 3ff3e81463fe38dfad63cecf5f89d90f84dcd9bd Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 12:05:03 -0800
Subject: [PATCH 17/71] consolidate in one view

---
 .../masking/XMLMaskingActivity.kt             | 134 ++++++++++--------
 1 file changed, 71 insertions(+), 63 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index eeaf850f6..72e4cd68a 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -1,5 +1,6 @@
 package com.example.androidobservability.masking
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
@@ -70,68 +71,6 @@ class XMLMaskingActivity : ComponentActivity() {
 		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
 			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
 
-			// Fullscreen overlay that captures outside taps
-			val overlay = FrameLayout(this).apply {
-				setBackgroundColor(Color.parseColor("#80000000"))
-				isClickable = true
-				isFocusable = true
-			}
-
-			// Centered popup content
-			val content = LinearLayout(this).apply {
-				orientation = LinearLayout.HORIZONTAL
-				setBackgroundColor(Color.WHITE)
-				elevation = 12f
-				setPadding(48, 32, 32, 32)
-			}
-
-			val label = TextView(this).apply {
-				text = "UserName"
-				setTextColor(Color.BLACK)
-			}
-
-			val sendButton = ImageButton(this).apply {
-				setImageResource(android.R.drawable.ic_menu_send)
-				contentDescription = "Send"
-				background = null
-			}
-
-			content.addView(label)
-			content.addView(
-				sendButton,
-				LinearLayout.LayoutParams(
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					ViewGroup.LayoutParams.WRAP_CONTENT
-				).apply { leftMargin = 24 }
-			)
-
-			overlay.addView(
-				content,
-				FrameLayout.LayoutParams(
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					Gravity.CENTER
-				)
-			)
-
-			// Dismiss on outside tap
-			overlay.setOnClickListener {
-				try {
-					windowManager.removeView(overlay)
-				} catch (_: Exception) {
-				}
-			}
-			// Consume clicks inside content so they don't dismiss
-			content.setOnClickListener { }
-
-			sendButton.setOnClickListener {
-				Toast.makeText(this, "Send clicked", Toast.LENGTH_SHORT).show()
-				try {
-					windowManager.removeView(overlay)
-				} catch (_: Exception) {
-				}
-			}
-
 			val params = WindowManager.LayoutParams().apply {
 				width = WindowManager.LayoutParams.MATCH_PARENT
 				height = WindowManager.LayoutParams.MATCH_PARENT
@@ -142,7 +81,19 @@ class XMLMaskingActivity : ComponentActivity() {
 				gravity = Gravity.CENTER
 			}
 
-			windowManager.addView(overlay, params)
+			val popupView = FloatingPopupView(this).apply {
+				onSendClicked = {
+					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
+				}
+				onDismissRequested = {
+					try {
+						windowManager.removeView(this)
+					} catch (_: Exception) {
+					}
+				}
+			}
+
+			windowManager.addView(popupView, params)
 		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)
@@ -156,4 +107,61 @@ class XMLMaskingActivity : ComponentActivity() {
 	}
 }
 
+class FloatingPopupView(context: Context) : FrameLayout(context) {
+
+	var onSendClicked: (() -> Unit)? = null
+	var onDismissRequested: (() -> Unit)? = null
+
+	init {
+		setBackgroundColor(Color.parseColor("#80000000"))
+		isClickable = true
+		isFocusable = true
+
+		val content = LinearLayout(context).apply {
+			orientation = LinearLayout.HORIZONTAL
+			setBackgroundColor(Color.WHITE)
+			elevation = 12f
+			setPadding(48, 32, 32, 32)
+		}
+
+		val label = TextView(context).apply {
+			text = "UserName"
+			setTextColor(Color.BLACK)
+		}
+
+		val sendButton = ImageButton(context).apply {
+			setImageResource(android.R.drawable.ic_menu_send)
+			contentDescription = "Send"
+			background = null
+		}
+
+		content.addView(label)
+		content.addView(
+			sendButton,
+			LinearLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT
+			).apply { leftMargin = 24 }
+		)
+
+		addView(
+			content,
+			FrameLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				Gravity.CENTER
+			)
+		)
+
+		// Outside tap dismiss
+		setOnClickListener { onDismissRequested?.invoke() }
+		// Consume inner content clicks
+		content.setOnClickListener { }
+		sendButton.setOnClickListener {
+			onSendClicked?.invoke()
+			onDismissRequested?.invoke()
+		}
+	}
+}
+
 

From 41e26453f13e26ca3a6d9512b16fbb51f4287f79 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:09:12 -0800
Subject: [PATCH 18/71] use Canvas for certain types of windows

---
 .../replay/capture/CaptureSource.kt           | 10 ++++---
 .../replay/capture/WindowEntry.kt             | 26 ++++++++++++++++++-
 .../replay/capture/WindowInspector.kt         |  3 +--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 1923f0f4d..fcbb6a015 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -142,7 +142,8 @@ class CaptureSource(
 
     private fun pickBaseWindow(windowsEntries: List<WindowEntry>): WindowEntry? {
         windowsEntries.firstOrNull {
-            (it.wmType == TYPE_APPLICATION || it.wmType == TYPE_BASE_APPLICATION)
+            val wmType = it.layoutParams?.type ?: 0
+            (wmType == TYPE_APPLICATION || wmType == TYPE_BASE_APPLICATION)
         }?.let { return it }
 
         windowsEntries.firstOrNull { it.type == WindowType.ACTIVITY }?.let { return it }
@@ -161,10 +162,13 @@ class CaptureSource(
 
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
         val view = windowEntry.rootView
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+        if (windowEntry.isPixelCopyCandidate()) {
             val window = windowInspector.findWindow(view)
             if (window != null) {
-                pixelCopy(window, view, windowEntry.rect())?.let { return it }
+                pixelCopy(window, view, windowEntry.rect())?.let {
+                    return it
+                }
             }
         }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
index 55ca5efc1..0deaada1a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
@@ -1,7 +1,11 @@
 package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Rect
+import android.os.Build
+import android.text.Layout
 import android.view.View
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
 
 
 enum class WindowType {
@@ -13,7 +17,7 @@ enum class WindowType {
 data class WindowEntry(
     val rootView: View,
     var type: WindowType,
-    val wmType: Int,
+    val layoutParams: WindowManager.LayoutParams?,
     val width: Int,
     val height: Int,
     val screenLeft: Int,
@@ -22,6 +26,26 @@ data class WindowEntry(
     fun rect(): Rect {
         return Rect(0, 0, width, height)
     }
+
+    fun isPixelCopyCandidate(): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return false
+        }
+        if (type != WindowType.ACTIVITY) {
+            return false
+        }
+
+        if (layoutParams?.type == TYPE_APPLICATION_STARTING) { // Starting/Splash screen
+            return false
+        }
+
+        if (((layoutParams?.flags ?: 0) and WindowManager.LayoutParams.FLAG_SECURE) != 0) {
+            // Secure window
+            return false
+        }
+
+        return true
+    }
 }
 
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 13450b05a..3152cebc2 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -33,7 +33,7 @@ class WindowInspector(private val logger: LDLogger) {
             WindowEntry(
                 rootView = view,
                 type = determineWindowType(wmType),
-                wmType = wmType,
+                layoutParams = layoutParams,
                 width = view.width,
                 height = view.height,
                 screenLeft = loc[0],
@@ -145,7 +145,6 @@ class WindowInspector(private val logger: LDLogger) {
             WindowManager.LayoutParams.TYPE_APPLICATION,
             WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
             WindowManager.LayoutParams.TYPE_APPLICATION_STARTING -> WindowType.ACTIVITY
-
             WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG -> WindowType.DIALOG
 
             else -> WindowType.OTHER

From ac99967ab769c15bfc5e1afd49890191dda0975d Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:12:10 -0800
Subject: [PATCH 19/71] space

---
 .../launchdarkly/observability/replay/capture/WindowInspector.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 3152cebc2..30b40b18a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -145,6 +145,7 @@ class WindowInspector(private val logger: LDLogger) {
             WindowManager.LayoutParams.TYPE_APPLICATION,
             WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
             WindowManager.LayoutParams.TYPE_APPLICATION_STARTING -> WindowType.ACTIVITY
+
             WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG -> WindowType.DIALOG
 
             else -> WindowType.OTHER

From 801ae96b2a9d7d78f8060851c6e28b4c2873549a Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:25:20 -0800
Subject: [PATCH 20/71] Attached dialog sample

---
 .../masking/XMLMaskingActivity.kt             | 59 ++++++++++++++++---
 .../res/layout/activity_masking_bench.xml     | 11 ++++
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index 72e4cd68a..a5fa74def 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -81,7 +81,36 @@ class XMLMaskingActivity : ComponentActivity() {
 				gravity = Gravity.CENTER
 			}
 
-			val popupView = FloatingPopupView(this).apply {
+			val popupView = FloatingPopupView(this, "Floating Popup").apply {
+				onSendClicked = {
+					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
+				}
+				onDismissRequested = {
+					try {
+						windowManager.removeView(this)
+					} catch (_: Exception) {
+					}
+				}
+			}
+
+			windowManager.addView(popupView, params)
+		}
+
+		findViewById<Button>(R.id.button_attached_dialog).setOnClickListener {
+			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+
+			val params = WindowManager.LayoutParams().apply {
+				width = WindowManager.LayoutParams.MATCH_PARENT
+				height = WindowManager.LayoutParams.MATCH_PARENT
+				format = PixelFormat.TRANSLUCENT
+				flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+				type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG
+				// Attach to this window so it behaves like an attached dialog
+				token = window.decorView.windowToken
+				gravity = Gravity.CENTER
+			}
+
+			val popupView = FloatingPopupView(this, "Attached Dialog").apply {
 				onSendClicked = {
 					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
 				}
@@ -107,7 +136,7 @@ class XMLMaskingActivity : ComponentActivity() {
 	}
 }
 
-class FloatingPopupView(context: Context) : FrameLayout(context) {
+class FloatingPopupView(context: Context, private val headerTitle: String) : FrameLayout(context) {
 
 	var onSendClicked: (() -> Unit)? = null
 	var onDismissRequested: (() -> Unit)? = null
@@ -117,13 +146,24 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 		isClickable = true
 		isFocusable = true
 
-		val content = LinearLayout(context).apply {
-			orientation = LinearLayout.HORIZONTAL
+		// White card container with vertical layout to host header and row
+		val contentContainer = LinearLayout(context).apply {
+			orientation = LinearLayout.VERTICAL
 			setBackgroundColor(Color.WHITE)
 			elevation = 12f
 			setPadding(48, 32, 32, 32)
 		}
 
+		val header = TextView(context).apply {
+			text = headerTitle
+			setTextColor(Color.BLACK)
+			textSize = 16f
+		}
+
+		val row = LinearLayout(context).apply {
+			orientation = LinearLayout.HORIZONTAL
+		}
+
 		val label = TextView(context).apply {
 			text = "UserName"
 			setTextColor(Color.BLACK)
@@ -135,8 +175,8 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 			background = null
 		}
 
-		content.addView(label)
-		content.addView(
+		row.addView(label)
+		row.addView(
 			sendButton,
 			LinearLayout.LayoutParams(
 				ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -144,8 +184,11 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 			).apply { leftMargin = 24 }
 		)
 
+		contentContainer.addView(header)
+		contentContainer.addView(row)
+
 		addView(
-			content,
+			contentContainer,
 			FrameLayout.LayoutParams(
 				ViewGroup.LayoutParams.WRAP_CONTENT,
 				ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -156,7 +199,7 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 		// Outside tap dismiss
 		setOnClickListener { onDismissRequested?.invoke() }
 		// Consume inner content clicks
-		content.setOnClickListener { }
+		contentContainer.setOnClickListener { }
 		sendButton.setOnClickListener {
 			onSendClicked?.invoke()
 			onDismissRequested?.invoke()
diff --git a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
index 8d4e1b363..840aa2d0f 100644
--- a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
+++ b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
@@ -100,6 +100,17 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:text="Floating Popup" />
+
+			<Space
+				android:layout_width="12dp"
+				android:layout_height="1dp" />
+
+			<Button
+				android:id="@+id/button_attached_dialog"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="Attached Dialog" />
 		</LinearLayout>
 
 		<TextView

From e6185249afd8400d30ecba6d6985c4e8fba20e81 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 14:28:22 -0800
Subject: [PATCH 21/71] Matrix

---
 .../com/launchdarkly/observability/replay/masking/Mask.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
index 3a59b4ca0..ce416aeba 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
@@ -1,7 +1,10 @@
 package com.launchdarkly.observability.replay.masking
-import androidx.compose.ui.geometry.Rect
+import android.graphics.RectF
+import androidx.compose.ui.graphics.Matrix
 
 data class Mask(
-    val rect: Rect
+    val rect: RectF,
+    val viewId: Int,
+    val matrix: Matrix
 )
 

From 1ece408e417a1d72b6899cca3f69f6388e7b0103 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 14:32:24 -0800
Subject: [PATCH 22/71] renaming to MaskCollector

---
 .../observability/replay/capture/CaptureSource.kt          | 7 +++----
 .../{SensitiveAreasCollector.kt => MaskCollector.kt}       | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/{SensitiveAreasCollector.kt => MaskCollector.kt} (96%)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index d10dcc066..e4e97fbbf 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -6,7 +6,6 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
@@ -19,7 +18,7 @@ import android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION
 import com.launchdarkly.logging.LDLogger
 import com.launchdarkly.observability.coroutines.DispatcherProviderHolder
 import com.launchdarkly.observability.replay.masking.MaskMatcher
-import com.launchdarkly.observability.replay.masking.SensitiveAreasCollector
+import com.launchdarkly.observability.replay.masking.MaskCollector
 import io.opentelemetry.android.session.SessionManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -53,7 +52,7 @@ class CaptureSource(
     private val _captureEventFlow = MutableSharedFlow<CaptureEvent>()
     val captureFlow: SharedFlow<CaptureEvent> = _captureEventFlow.asSharedFlow()
     private val windowInspector = WindowInspector(logger)
-    private val sensitiveAreasCollector = SensitiveAreasCollector(logger)
+    private val maskCollector = MaskCollector(logger)
     private val maskPaint = Paint().apply {
         color = Color.GRAY
         style = Paint.Style.FILL
@@ -167,7 +166,7 @@ class CaptureSource(
 
     private suspend fun captureViewResult(windowEntry: WindowEntry): CaptureResult? {
         val bitmap = captureViewBitmap(windowEntry) ?: return null
-        val sensitiveComposeRects = sensitiveAreasCollector.collectFromActivity(windowEntry.rootView, maskMatchers)
+        val sensitiveComposeRects = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
         return CaptureResult(windowEntry, bitmap, sensitiveComposeRects)
     }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/SensitiveAreasCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
similarity index 96%
rename from sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/SensitiveAreasCollector.kt
rename to sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index 38769a1c9..78cca8b3f 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/SensitiveAreasCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -12,13 +12,13 @@ import com.launchdarkly.logging.LDLogger
  *
  * This encapsulates both Jetpack Compose and native View detection logic.
  */
-class SensitiveAreasCollector(private val logger: LDLogger) {
+class MaskCollector(private val logger: LDLogger) {
     /**
      * Find sensitive areas from all views in the provided [activity].
      *
      * @return a list of rects that represent sensitive areas that need to be masked
      */
-    fun collectFromActivity(view: View, matchers: List<MaskMatcher>): List<ComposeRect> {
+    fun collectMasks(view: View, matchers: List<MaskMatcher>): List<ComposeRect> {
         val allSensitiveRects = mutableListOf<ComposeRect>()
 
         try {

From 3e570b4bf34316af92dee67803c77584c190c6fa Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 11:41:07 -0800
Subject: [PATCH 23/71] add floating button

---
 .../masking/XMLMaskingActivity.kt             | 30 +++++++++++++++++++
 .../res/layout/activity_masking_bench.xml     | 11 +++++++
 2 files changed, 41 insertions(+)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index bbf80dd6c..c45490197 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -7,6 +7,13 @@ import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Toast
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.PopupWindow
+import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
 import com.example.androidobservability.R
@@ -59,6 +66,29 @@ class XMLMaskingActivity : ComponentActivity() {
 		findViewById<Button>(R.id.button_toast).setOnClickListener {
 			Toast.makeText(this, "This is an example toast.", Toast.LENGTH_SHORT).show()
 		}
+		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
+			val messageView = TextView(this).apply {
+				text = "This is a floating popup."
+				setTextColor(Color.BLACK)
+				setPadding(48, 32, 48, 32)
+			}
+			val container = LinearLayout(this).apply {
+				setBackgroundColor(Color.WHITE)
+				elevation = 8f
+				addView(messageView)
+			}
+			val popup = PopupWindow(
+				container,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				true
+			).apply {
+				isOutsideTouchable = true
+				setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+			}
+			val root = findViewById<View>(android.R.id.content)
+			popup.showAtLocation(root, Gravity.CENTER, 0, 0)
+		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)
 		val secondField = findViewById<EditText>(R.id.input_second)
diff --git a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
index dc9b264e0..8d4e1b363 100644
--- a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
+++ b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
@@ -89,6 +89,17 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:text="Toast" />
+
+			<Space
+				android:layout_width="12dp"
+				android:layout_height="1dp" />
+
+			<Button
+				android:id="@+id/button_floating_popup"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="Floating Popup" />
 		</LinearLayout>
 
 		<TextView

From aef315465d532a4585815939e2a318d78caf797c Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 12:00:55 -0800
Subject: [PATCH 24/71] sample of adding floating views

---
 .../masking/XMLMaskingActivity.kt             | 93 +++++++++++++++----
 1 file changed, 74 insertions(+), 19 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index c45490197..eeaf850f6 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -8,11 +8,12 @@ import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.Toast
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
+import android.graphics.PixelFormat
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
-import android.widget.PopupWindow
+import android.view.WindowManager
+import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
@@ -67,27 +68,81 @@ class XMLMaskingActivity : ComponentActivity() {
 			Toast.makeText(this, "This is an example toast.", Toast.LENGTH_SHORT).show()
 		}
 		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
-			val messageView = TextView(this).apply {
-				text = "This is a floating popup."
-				setTextColor(Color.BLACK)
-				setPadding(48, 32, 48, 32)
+			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+
+			// Fullscreen overlay that captures outside taps
+			val overlay = FrameLayout(this).apply {
+				setBackgroundColor(Color.parseColor("#80000000"))
+				isClickable = true
+				isFocusable = true
 			}
-			val container = LinearLayout(this).apply {
+
+			// Centered popup content
+			val content = LinearLayout(this).apply {
+				orientation = LinearLayout.HORIZONTAL
 				setBackgroundColor(Color.WHITE)
-				elevation = 8f
-				addView(messageView)
+				elevation = 12f
+				setPadding(48, 32, 32, 32)
+			}
+
+			val label = TextView(this).apply {
+				text = "UserName"
+				setTextColor(Color.BLACK)
+			}
+
+			val sendButton = ImageButton(this).apply {
+				setImageResource(android.R.drawable.ic_menu_send)
+				contentDescription = "Send"
+				background = null
+			}
+
+			content.addView(label)
+			content.addView(
+				sendButton,
+				LinearLayout.LayoutParams(
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT
+				).apply { leftMargin = 24 }
+			)
+
+			overlay.addView(
+				content,
+				FrameLayout.LayoutParams(
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					ViewGroup.LayoutParams.WRAP_CONTENT,
+					Gravity.CENTER
+				)
+			)
+
+			// Dismiss on outside tap
+			overlay.setOnClickListener {
+				try {
+					windowManager.removeView(overlay)
+				} catch (_: Exception) {
+				}
 			}
-			val popup = PopupWindow(
-				container,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				true
-			).apply {
-				isOutsideTouchable = true
-				setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+			// Consume clicks inside content so they don't dismiss
+			content.setOnClickListener { }
+
+			sendButton.setOnClickListener {
+				Toast.makeText(this, "Send clicked", Toast.LENGTH_SHORT).show()
+				try {
+					windowManager.removeView(overlay)
+				} catch (_: Exception) {
+				}
 			}
-			val root = findViewById<View>(android.R.id.content)
-			popup.showAtLocation(root, Gravity.CENTER, 0, 0)
+
+			val params = WindowManager.LayoutParams().apply {
+				width = WindowManager.LayoutParams.MATCH_PARENT
+				height = WindowManager.LayoutParams.MATCH_PARENT
+				format = PixelFormat.TRANSLUCENT
+				flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+				type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
+				token = window.decorView.applicationWindowToken
+				gravity = Gravity.CENTER
+			}
+
+			windowManager.addView(overlay, params)
 		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)

From 12ed36c35d5085a35e579d2a84285aaa7fa58394 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 12:05:03 -0800
Subject: [PATCH 25/71] consolidate in one view

---
 .../masking/XMLMaskingActivity.kt             | 134 ++++++++++--------
 1 file changed, 71 insertions(+), 63 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index eeaf850f6..72e4cd68a 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -1,5 +1,6 @@
 package com.example.androidobservability.masking
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
@@ -70,68 +71,6 @@ class XMLMaskingActivity : ComponentActivity() {
 		findViewById<Button>(R.id.button_floating_popup).setOnClickListener {
 			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
 
-			// Fullscreen overlay that captures outside taps
-			val overlay = FrameLayout(this).apply {
-				setBackgroundColor(Color.parseColor("#80000000"))
-				isClickable = true
-				isFocusable = true
-			}
-
-			// Centered popup content
-			val content = LinearLayout(this).apply {
-				orientation = LinearLayout.HORIZONTAL
-				setBackgroundColor(Color.WHITE)
-				elevation = 12f
-				setPadding(48, 32, 32, 32)
-			}
-
-			val label = TextView(this).apply {
-				text = "UserName"
-				setTextColor(Color.BLACK)
-			}
-
-			val sendButton = ImageButton(this).apply {
-				setImageResource(android.R.drawable.ic_menu_send)
-				contentDescription = "Send"
-				background = null
-			}
-
-			content.addView(label)
-			content.addView(
-				sendButton,
-				LinearLayout.LayoutParams(
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					ViewGroup.LayoutParams.WRAP_CONTENT
-				).apply { leftMargin = 24 }
-			)
-
-			overlay.addView(
-				content,
-				FrameLayout.LayoutParams(
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					ViewGroup.LayoutParams.WRAP_CONTENT,
-					Gravity.CENTER
-				)
-			)
-
-			// Dismiss on outside tap
-			overlay.setOnClickListener {
-				try {
-					windowManager.removeView(overlay)
-				} catch (_: Exception) {
-				}
-			}
-			// Consume clicks inside content so they don't dismiss
-			content.setOnClickListener { }
-
-			sendButton.setOnClickListener {
-				Toast.makeText(this, "Send clicked", Toast.LENGTH_SHORT).show()
-				try {
-					windowManager.removeView(overlay)
-				} catch (_: Exception) {
-				}
-			}
-
 			val params = WindowManager.LayoutParams().apply {
 				width = WindowManager.LayoutParams.MATCH_PARENT
 				height = WindowManager.LayoutParams.MATCH_PARENT
@@ -142,7 +81,19 @@ class XMLMaskingActivity : ComponentActivity() {
 				gravity = Gravity.CENTER
 			}
 
-			windowManager.addView(overlay, params)
+			val popupView = FloatingPopupView(this).apply {
+				onSendClicked = {
+					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
+				}
+				onDismissRequested = {
+					try {
+						windowManager.removeView(this)
+					} catch (_: Exception) {
+					}
+				}
+			}
+
+			windowManager.addView(popupView, params)
 		}
 
 		val firstField = findViewById<EditText>(R.id.input_first)
@@ -156,4 +107,61 @@ class XMLMaskingActivity : ComponentActivity() {
 	}
 }
 
+class FloatingPopupView(context: Context) : FrameLayout(context) {
+
+	var onSendClicked: (() -> Unit)? = null
+	var onDismissRequested: (() -> Unit)? = null
+
+	init {
+		setBackgroundColor(Color.parseColor("#80000000"))
+		isClickable = true
+		isFocusable = true
+
+		val content = LinearLayout(context).apply {
+			orientation = LinearLayout.HORIZONTAL
+			setBackgroundColor(Color.WHITE)
+			elevation = 12f
+			setPadding(48, 32, 32, 32)
+		}
+
+		val label = TextView(context).apply {
+			text = "UserName"
+			setTextColor(Color.BLACK)
+		}
+
+		val sendButton = ImageButton(context).apply {
+			setImageResource(android.R.drawable.ic_menu_send)
+			contentDescription = "Send"
+			background = null
+		}
+
+		content.addView(label)
+		content.addView(
+			sendButton,
+			LinearLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT
+			).apply { leftMargin = 24 }
+		)
+
+		addView(
+			content,
+			FrameLayout.LayoutParams(
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				ViewGroup.LayoutParams.WRAP_CONTENT,
+				Gravity.CENTER
+			)
+		)
+
+		// Outside tap dismiss
+		setOnClickListener { onDismissRequested?.invoke() }
+		// Consume inner content clicks
+		content.setOnClickListener { }
+		sendButton.setOnClickListener {
+			onSendClicked?.invoke()
+			onDismissRequested?.invoke()
+		}
+	}
+}
+
 

From 343690e898492c25a60c05d959dde2e5983f1a4a Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:09:12 -0800
Subject: [PATCH 26/71] use Canvas for certain types of windows

---
 .../replay/capture/CaptureSource.kt           | 10 ++++---
 .../replay/capture/WindowEntry.kt             | 26 ++++++++++++++++++-
 .../replay/capture/WindowInspector.kt         |  3 +--
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index b6f3e9c7c..d10dcc066 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -153,7 +153,8 @@ class CaptureSource(
 
     private fun pickBaseWindow(windowsEntries: List<WindowEntry>): WindowEntry? {
         windowsEntries.firstOrNull {
-            (it.wmType == TYPE_APPLICATION || it.wmType == TYPE_BASE_APPLICATION)
+            val wmType = it.layoutParams?.type ?: 0
+            (wmType == TYPE_APPLICATION || wmType == TYPE_BASE_APPLICATION)
         }?.let { return it }
 
         windowsEntries.firstOrNull { it.type == WindowType.ACTIVITY }?.let { return it }
@@ -172,10 +173,13 @@ class CaptureSource(
 
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
         val view = windowEntry.rootView
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+        if (windowEntry.isPixelCopyCandidate()) {
             val window = windowInspector.findWindow(view)
             if (window != null) {
-                pixelCopy(window, view, windowEntry.rect())?.let { return it }
+                pixelCopy(window, view, windowEntry.rect())?.let {
+                    return it
+                }
             }
         }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
index 55ca5efc1..0deaada1a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
@@ -1,7 +1,11 @@
 package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Rect
+import android.os.Build
+import android.text.Layout
 import android.view.View
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
 
 
 enum class WindowType {
@@ -13,7 +17,7 @@ enum class WindowType {
 data class WindowEntry(
     val rootView: View,
     var type: WindowType,
-    val wmType: Int,
+    val layoutParams: WindowManager.LayoutParams?,
     val width: Int,
     val height: Int,
     val screenLeft: Int,
@@ -22,6 +26,26 @@ data class WindowEntry(
     fun rect(): Rect {
         return Rect(0, 0, width, height)
     }
+
+    fun isPixelCopyCandidate(): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return false
+        }
+        if (type != WindowType.ACTIVITY) {
+            return false
+        }
+
+        if (layoutParams?.type == TYPE_APPLICATION_STARTING) { // Starting/Splash screen
+            return false
+        }
+
+        if (((layoutParams?.flags ?: 0) and WindowManager.LayoutParams.FLAG_SECURE) != 0) {
+            // Secure window
+            return false
+        }
+
+        return true
+    }
 }
 
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 13450b05a..3152cebc2 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -33,7 +33,7 @@ class WindowInspector(private val logger: LDLogger) {
             WindowEntry(
                 rootView = view,
                 type = determineWindowType(wmType),
-                wmType = wmType,
+                layoutParams = layoutParams,
                 width = view.width,
                 height = view.height,
                 screenLeft = loc[0],
@@ -145,7 +145,6 @@ class WindowInspector(private val logger: LDLogger) {
             WindowManager.LayoutParams.TYPE_APPLICATION,
             WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
             WindowManager.LayoutParams.TYPE_APPLICATION_STARTING -> WindowType.ACTIVITY
-
             WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG -> WindowType.DIALOG
 
             else -> WindowType.OTHER

From a4cf491e7a083c16a49f1427a0178e5e0314ee9d Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:12:10 -0800
Subject: [PATCH 27/71] space

---
 .../launchdarkly/observability/replay/capture/WindowInspector.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 3152cebc2..30b40b18a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -145,6 +145,7 @@ class WindowInspector(private val logger: LDLogger) {
             WindowManager.LayoutParams.TYPE_APPLICATION,
             WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
             WindowManager.LayoutParams.TYPE_APPLICATION_STARTING -> WindowType.ACTIVITY
+
             WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG -> WindowType.DIALOG
 
             else -> WindowType.OTHER

From b117d79c9a49953d95b7f932adafa43101550e08 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Sun, 30 Nov 2025 15:25:20 -0800
Subject: [PATCH 28/71] Attached dialog sample

---
 .../masking/XMLMaskingActivity.kt             | 59 ++++++++++++++++---
 .../res/layout/activity_masking_bench.xml     | 11 ++++
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index 72e4cd68a..a5fa74def 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -81,7 +81,36 @@ class XMLMaskingActivity : ComponentActivity() {
 				gravity = Gravity.CENTER
 			}
 
-			val popupView = FloatingPopupView(this).apply {
+			val popupView = FloatingPopupView(this, "Floating Popup").apply {
+				onSendClicked = {
+					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
+				}
+				onDismissRequested = {
+					try {
+						windowManager.removeView(this)
+					} catch (_: Exception) {
+					}
+				}
+			}
+
+			windowManager.addView(popupView, params)
+		}
+
+		findViewById<Button>(R.id.button_attached_dialog).setOnClickListener {
+			val windowManager = getSystemService(WINDOW_SERVICE) as WindowManager
+
+			val params = WindowManager.LayoutParams().apply {
+				width = WindowManager.LayoutParams.MATCH_PARENT
+				height = WindowManager.LayoutParams.MATCH_PARENT
+				format = PixelFormat.TRANSLUCENT
+				flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+				type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG
+				// Attach to this window so it behaves like an attached dialog
+				token = window.decorView.windowToken
+				gravity = Gravity.CENTER
+			}
+
+			val popupView = FloatingPopupView(this, "Attached Dialog").apply {
 				onSendClicked = {
 					Toast.makeText(this@XMLMaskingActivity, "Send clicked", Toast.LENGTH_SHORT).show()
 				}
@@ -107,7 +136,7 @@ class XMLMaskingActivity : ComponentActivity() {
 	}
 }
 
-class FloatingPopupView(context: Context) : FrameLayout(context) {
+class FloatingPopupView(context: Context, private val headerTitle: String) : FrameLayout(context) {
 
 	var onSendClicked: (() -> Unit)? = null
 	var onDismissRequested: (() -> Unit)? = null
@@ -117,13 +146,24 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 		isClickable = true
 		isFocusable = true
 
-		val content = LinearLayout(context).apply {
-			orientation = LinearLayout.HORIZONTAL
+		// White card container with vertical layout to host header and row
+		val contentContainer = LinearLayout(context).apply {
+			orientation = LinearLayout.VERTICAL
 			setBackgroundColor(Color.WHITE)
 			elevation = 12f
 			setPadding(48, 32, 32, 32)
 		}
 
+		val header = TextView(context).apply {
+			text = headerTitle
+			setTextColor(Color.BLACK)
+			textSize = 16f
+		}
+
+		val row = LinearLayout(context).apply {
+			orientation = LinearLayout.HORIZONTAL
+		}
+
 		val label = TextView(context).apply {
 			text = "UserName"
 			setTextColor(Color.BLACK)
@@ -135,8 +175,8 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 			background = null
 		}
 
-		content.addView(label)
-		content.addView(
+		row.addView(label)
+		row.addView(
 			sendButton,
 			LinearLayout.LayoutParams(
 				ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -144,8 +184,11 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 			).apply { leftMargin = 24 }
 		)
 
+		contentContainer.addView(header)
+		contentContainer.addView(row)
+
 		addView(
-			content,
+			contentContainer,
 			FrameLayout.LayoutParams(
 				ViewGroup.LayoutParams.WRAP_CONTENT,
 				ViewGroup.LayoutParams.WRAP_CONTENT,
@@ -156,7 +199,7 @@ class FloatingPopupView(context: Context) : FrameLayout(context) {
 		// Outside tap dismiss
 		setOnClickListener { onDismissRequested?.invoke() }
 		// Consume inner content clicks
-		content.setOnClickListener { }
+		contentContainer.setOnClickListener { }
 		sendButton.setOnClickListener {
 			onSendClicked?.invoke()
 			onDismissRequested?.invoke()
diff --git a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
index 8d4e1b363..840aa2d0f 100644
--- a/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
+++ b/e2e/android/app/src/main/res/layout/activity_masking_bench.xml
@@ -100,6 +100,17 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:text="Floating Popup" />
+
+			<Space
+				android:layout_width="12dp"
+				android:layout_height="1dp" />
+
+			<Button
+				android:id="@+id/button_attached_dialog"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:text="Attached Dialog" />
 		</LinearLayout>
 
 		<TextView

From 55e29da6b0ce1efc18c65bae463c8e5d882ff8e8 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Mon, 1 Dec 2025 21:00:44 -0800
Subject: [PATCH 29/71] Filter AndroidComposeView

---
 .../replay/capture/CaptureSource.kt           |  22 +--
 .../replay/masking/ComposeMaskTarget.kt       |   5 +-
 .../observability/replay/masking/Mask.kt      |   2 +-
 .../replay/masking/MaskCollector.kt           | 131 +++++++-----------
 .../replay/masking/MaskMatcher.kt             |   4 +-
 .../replay/masking/NativeMaskTarget.kt        |  14 +-
 6 files changed, 72 insertions(+), 106 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index e4e97fbbf..9626a07a1 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -28,8 +28,8 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import kotlin.coroutines.resume
-import androidx.compose.ui.geometry.Rect as ComposeRect
 import androidx.core.graphics.withTranslation
+import com.launchdarkly.observability.replay.masking.Mask
 
 /**
  * A source of [CaptureEvent]s taken from the most recently resumed [Activity]s window. Captures
@@ -46,7 +46,7 @@ class CaptureSource(
     data class CaptureResult(
         val windowEntry: WindowEntry,
         val bitmap: Bitmap,
-        val masks: List<ComposeRect>
+        val masks: List<Mask>
     )
 
     private val _captureEventFlow = MutableSharedFlow<CaptureEvent>()
@@ -166,8 +166,8 @@ class CaptureSource(
 
     private suspend fun captureViewResult(windowEntry: WindowEntry): CaptureResult? {
         val bitmap = captureViewBitmap(windowEntry) ?: return null
-        val sensitiveComposeRects = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
-        return CaptureResult(windowEntry, bitmap, sensitiveComposeRects)
+        val masks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
+        return CaptureResult(windowEntry, bitmap, masks)
     }
 
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
@@ -288,15 +288,15 @@ class CaptureSource(
      * @param canvas The canvas to mask
      * @param masks rects that will be masked
      */
-    private fun drawMasks(canvas: Canvas, masks: List<ComposeRect>) {
+    private fun drawMasks(canvas: Canvas, masks: List<Mask>) {
         masks.forEach { mask ->
-            val androidRect = Rect(
-                mask.left.toInt(),
-                mask.top.toInt(),
-                mask.right.toInt(),
-                mask.bottom.toInt()
+            val integerRect = Rect(
+                mask.rect.left.toInt(),
+                mask.rect.top.toInt(),
+                mask.rect.right.toInt(),
+                mask.rect.bottom.toInt()
             )
-            canvas.drawRect(androidRect, maskPaint)
+            canvas.drawRect(integerRect, maskPaint)
         }
     }
 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index bf32610b1..50112e65f 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -1,6 +1,7 @@
 package com.launchdarkly.observability.replay.masking
 
 import android.view.View
+import androidx.compose.ui.graphics.toAndroidRectF
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.semantics.SemanticsNode
 import androidx.compose.ui.semantics.SemanticsOwner
@@ -72,8 +73,8 @@ data class ComposeMaskTarget(
         return config.contains(SemanticsProperties.Text)
     }
 
-    override fun maskRect(): MaskRect? {
-        return boundsInWindow
+    override fun mask(): Mask? {
+        return Mask(boundsInWindow.toAndroidRectF(), view.id)
     }
 
     override fun hasLDMask(): Boolean {
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
index ce416aeba..82c77ceb8 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
@@ -5,6 +5,6 @@ import androidx.compose.ui.graphics.Matrix
 data class Mask(
     val rect: RectF,
     val viewId: Int,
-    val matrix: Matrix
+    val matrix: Matrix? = null
 )
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index 78cca8b3f..a62dce008 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -2,10 +2,10 @@ package com.launchdarkly.observability.replay.masking
 
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.ui.platform.AbstractComposeView
 import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.semantics.SemanticsNode
-import androidx.compose.ui.geometry.Rect as ComposeRect
 import com.launchdarkly.logging.LDLogger
+import kotlin.collections.plusAssign
 
 /**
  * Collects sensitive screen areas that should be masked in session replay.
@@ -14,117 +14,80 @@ import com.launchdarkly.logging.LDLogger
  */
 class MaskCollector(private val logger: LDLogger) {
     /**
-     * Find sensitive areas from all views in the provided [activity].
+     * Find sensitive areas from all views in the provided [view].
      *
      * @return a list of rects that represent sensitive areas that need to be masked
      */
-    fun collectMasks(view: View, matchers: List<MaskMatcher>): List<ComposeRect> {
-        val allSensitiveRects = mutableListOf<ComposeRect>()
-
-        try {
-            val views = findViews(view)
+    fun collectMasks(root: View, matchers: List<MaskMatcher>): List<Mask> {
+        val resultMasks = mutableListOf<Mask>()
+        traverse(root, matchers, resultMasks)
+        return resultMasks
+    }
 
-            views.forEach { view ->
-                when (view) {
-                    is ComposeView ->
-                        ComposeMaskTarget.from(view, logger)?.let { target ->
-                            allSensitiveRects += findComposeSensitiveAreas(target, matchers)
-                        }
-                    else ->
-                        allSensitiveRects += findNativeSensitiveRects(NativeMaskTarget(view), matchers)
-                }
-            }
-        } catch (ignored: Exception) {
-            // Best-effort collection; ignore failures accessing Compose internals
-            logger.warn("Failure building sensitive rects ")
+    fun traverseCompose(view: ComposeView, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
+        val target = ComposeMaskTarget.from(view, logger)
+        if (target != null) {
+            traverseComposeNodes(target, matchers, masks)
         }
 
-        return allSensitiveRects
+        for (i in 0 until view.childCount) {
+            val child = view.getChildAt(i)
+            traverse(child, matchers, masks)
+        }
     }
 
-    /**
-     * Recursively find all views in the hierarchy.
-     */
-    private fun findViews(view: View): List<View> {
-        val views = mutableListOf<View>()
+    fun traverseNative(view: View, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
+        val target = NativeMaskTarget(view)
+        if (shouldMask(target, matchers)) {
+            target.mask()?.let { masks += it }
+        }
 
-        views.add(view)
+        if (view !is ViewGroup) return
 
-        if (view is ViewGroup) {
-            for (i in 0 until view.childCount) {
-                val child = view.getChildAt(i)
-                views.addAll(findViews(child))
-            }
+        for (i in 0 until view.childCount) {
+            val child = view.getChildAt(i)
+            traverse(child, matchers, masks)
         }
-
-        return views
     }
 
-    /**
-     * Find sensitive Compose areas by traversing the semantic node tree.
-     */
-    private fun findComposeSensitiveAreas(
-        maskTarget: ComposeMaskTarget,
-        matchers: List<MaskMatcher>
-    ): List<ComposeRect> {
-        // TODO: O11Y-629 - add logic to check for sensitive areas in Compose views
-        val sensitiveRects = mutableListOf<ComposeRect>()
+    fun traverse(view: View, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
+        if (!view.isShown) return
 
-        try {
-            traverseSemanticNode(maskTarget.rootNode, sensitiveRects, maskTarget, matchers)
-        } catch (ignored: Exception) {
-            // Ignore issues in semantics tree traversal
+        if (view is AbstractComposeView) {
+            traverseCompose(view, matchers, masks)
+        } else if (!view::class.java.name.contains("AndroidComposeView")) {
+            traverseNative(view, matchers, masks)
         }
-
-        return sensitiveRects
     }
 
     /**
-     * Recursively traverse a semantic node and its children to find sensitive areas.
+     * Check if a native view is sensitive and add its bounds to the list if it is.
      */
-    private fun traverseSemanticNode(
-        node: SemanticsNode,
-        sensitiveRects: MutableList<ComposeRect>,
-        maskTarget: ComposeMaskTarget,
-        matchers: List<MaskMatcher>
+    private fun traverseComposeNodes(
+        target: ComposeMaskTarget,
+        matchers: List<MaskMatcher>,
+        masks: MutableList<Mask>
     ) {
-        // current node target is provided as parameter
-        // check ldMask() modifier; do not return early so children are still traversed
-        val hasLDMask = maskTarget.hasLDMask()
-        if (hasLDMask || matchers.any { it.isMatch(maskTarget) }) {
-            maskTarget.maskRect()?.let { sensitiveRects.add(it) }
+        if (shouldMask(target, matchers)) {
+            target.mask()?.let { masks += it }
         }
 
-        node.children.forEach { child ->
+        for (child in target.rootNode.children) {
             val childTarget = ComposeMaskTarget(
-                view = maskTarget.view,
-                rootNode = maskTarget.rootNode,
+                view = target.view,
+                rootNode = child,
                 config = child.config,
                 boundsInWindow = child.boundsInWindow
             )
-            traverseSemanticNode(child, sensitiveRects, childTarget, matchers)
+            traverseComposeNodes(childTarget, matchers, masks)
         }
     }
 
-    /**
-     * Check if a native view is sensitive and add its bounds to the list if it is.
-     */
-    private fun findNativeSensitiveRects(
-        target: NativeMaskTarget,
+    private fun shouldMask(
+        target: MaskTarget,
         matchers: List<MaskMatcher>
-    ): List<ComposeRect> {
-        val sensitiveRects = mutableListOf<ComposeRect>()
-        var isSensitive = target.hasLDMask()
-
-        if (!isSensitive) {
-            // Allow matchers to determine sensitivity for native views as well
-            isSensitive = matchers.any { matcher -> matcher.isMatch(target) }
-        }
-
-        if (isSensitive) {
-            target.maskRect()?.let { sensitiveRects.add(it) }
-        }
-
-        return sensitiveRects
+    ): Boolean {
+        return target.hasLDMask()
+            || matchers.any { matcher -> matcher.isMatch(target) }
     }
 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
index 5c2d9dafb..eedc8d80b 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
@@ -1,17 +1,17 @@
 package com.launchdarkly.observability.replay.masking
 
 import android.view.View
-import androidx.compose.ui.geometry.Rect as ComposeRect
 
 /**
  * Target to evaluate for masking. Sealed to restrict implementations to this module/package.
  */
 sealed interface MaskTarget {
     val view: View
+
     fun isTextInput(): Boolean
     fun isText(): Boolean
     fun isSensitive(sensitiveKeywords: List<String>): Boolean
-    fun maskRect(): ComposeRect?
+    fun mask(): Mask?
     fun hasLDMask(): Boolean
 }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index 1d66b965f..8b21a23ac 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -6,7 +6,9 @@ import android.widget.TextView
 import android.text.method.PasswordTransformationMethod
 import androidx.compose.ui.geometry.Rect as ComposeRect
 import kotlin.text.lowercase
-import com.launchdarkly.observability.R     
+import com.launchdarkly.observability.R
+import android.graphics.RectF
+
 /**
  *   Native view target
  */
@@ -51,18 +53,18 @@ data class NativeMaskTarget(
         return false
     }
 
-    override fun maskRect(): ComposeRect? {
+    override fun mask(): Mask? {
         val location = IntArray(2)
         view.getLocationInWindow(location)
         val left = location[0].toFloat()
         val top = location[1].toFloat()
-        val right = left + view.width
-        val bottom = top + view.height
-
-        return ComposeRect(left, top, right, bottom)
+        val rect = RectF(left, top, left + view.width, top + view.height)
+        return Mask(rect, view.id, matrix = null)
     }
 
     override fun hasLDMask(): Boolean {
         return view.getTag(R.id.ld_mask_tag) as? Boolean ?: false
     }
+
+
 }

From 4c0db2302e63befa472759cf08cecbc449277fa5 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 12:01:32 -0800
Subject: [PATCH 30/71] fix mask warning

---
 .../replay/capture/WindowInspector.kt         |  8 +++----
 .../observability/replay/masking/Mask.kt      | 21 ++++++++++++++++++-
 .../replay/utils/ViewGraphicsExtenstions.kt   | 13 ++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 30b40b18a..90147efed 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import com.launchdarkly.logging.LDLogger
+import com.launchdarkly.observability.replay.utils.locationOnScreen
 import kotlin.jvm.javaClass
 
 class WindowInspector(private val logger: LDLogger) {
@@ -24,8 +25,7 @@ class WindowInspector(private val logger: LDLogger) {
             if (!view.getGlobalVisibleRect(visibleRect)) return@mapNotNull null
             if (visibleRect.width() == 0 || visibleRect.height() == 0) return@mapNotNull null
 
-            val loc = IntArray(2)
-            view.getLocationOnScreen(loc)
+            val (screenX, screenY) = view.locationOnScreen()
 
             val layoutParams = view.layoutParams as? WindowManager.LayoutParams
             val wmType = layoutParams?.type ?: 0
@@ -36,8 +36,8 @@ class WindowInspector(private val logger: LDLogger) {
                 layoutParams = layoutParams,
                 width = view.width,
                 height = view.height,
-                screenLeft = loc[0],
-                screenTop = loc[1]
+                screenLeft = screenX.toInt(),
+                screenTop = screenY.toInt()
             )
         }
     }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
index 82c77ceb8..5905495d6 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
@@ -5,6 +5,25 @@ import androidx.compose.ui.graphics.Matrix
 data class Mask(
     val rect: RectF,
     val viewId: Int,
+    val points: FloatArray,
     val matrix: Matrix? = null
-)
+){
+    // Implemented to suppress warning
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Mask) return false
+        return rect == other.rect &&
+                viewId == other.viewId &&
+                points.contentEquals(other.points) &&
+                matrix == other.matrix
+    }
 
+    // Implemented to suppress warning
+    override fun hashCode(): Int {
+        var result = rect.hashCode()
+        result = 31 * result + viewId
+        result = 31 * result + points.contentHashCode()
+        result = 31 * result + (matrix?.hashCode() ?: 0)
+        return result
+    }
+}
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
new file mode 100644
index 000000000..faef4c62f
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
@@ -0,0 +1,13 @@
+package com.launchdarkly.observability.replay.utils
+
+import android.view.View
+
+/**
+ * Returns this view's top-left screen coordinates as a Pair of Floats (x, y).
+ */
+fun View.locationOnScreen(): Pair<Float, Float> {
+    val loc = IntArray(2)
+    getLocationOnScreen(loc)
+    return loc[0].toFloat() to loc[1].toFloat()
+}
+

From 0144cef3b07b009fd2a91dfce8e9cd10a9064f3a Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 12:01:58 -0800
Subject: [PATCH 31/71] using root.locationOnScreen

---
 .../observability/replay/masking/MaskCollector.kt           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index a62dce008..2bf56c05d 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -2,9 +2,11 @@ package com.launchdarkly.observability.replay.masking
 
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.ui.graphics.Matrix
 import androidx.compose.ui.platform.AbstractComposeView
 import androidx.compose.ui.platform.ComposeView
 import com.launchdarkly.logging.LDLogger
+import com.launchdarkly.observability.replay.utils.locationOnScreen
 import kotlin.collections.plusAssign
 
 /**
@@ -20,6 +22,10 @@ class MaskCollector(private val logger: LDLogger) {
      */
     fun collectMasks(root: View, matchers: List<MaskMatcher>): List<Mask> {
         val resultMasks = mutableListOf<Mask>()
+        val matrix = Matrix()
+
+        val (rootX, rootY) = root.locationOnScreen()
+
         traverse(root, matchers, resultMasks)
         return resultMasks
     }

From 31bb519abfa783e992827c63821a849fb5bd859a Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 12:19:10 -0800
Subject: [PATCH 32/71] address feadback

---
 .../masking/XMLMaskingActivity.kt             | 14 ++--
 .../replay/capture/CaptureSource.kt           |  2 +-
 .../replay/capture/WindowEntry.kt             |  4 -
 .../replay/capture/WindowEntryTest.kt         | 77 +++++++++++++++++++
 4 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/WindowEntryTest.kt

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index a5fa74def..3bca916c1 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -11,13 +11,13 @@ import android.widget.Toast
 import android.graphics.Color
 import android.graphics.PixelFormat
 import android.view.Gravity
-import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.activity.ComponentActivity
 import android.app.AlertDialog
+import androidx.core.graphics.toColorInt
 import com.example.androidobservability.R
 
 class XMLMaskingActivity : ComponentActivity() {
@@ -142,7 +142,7 @@ class FloatingPopupView(context: Context, private val headerTitle: String) : Fra
 	var onDismissRequested: (() -> Unit)? = null
 
 	init {
-		setBackgroundColor(Color.parseColor("#80000000"))
+        setBackgroundColor("#80000000".toColorInt())
 		isClickable = true
 		isFocusable = true
 
@@ -179,8 +179,8 @@ class FloatingPopupView(context: Context, private val headerTitle: String) : Fra
 		row.addView(
 			sendButton,
 			LinearLayout.LayoutParams(
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				ViewGroup.LayoutParams.WRAP_CONTENT
+				LayoutParams.WRAP_CONTENT,
+				LayoutParams.WRAP_CONTENT
 			).apply { leftMargin = 24 }
 		)
 
@@ -189,9 +189,9 @@ class FloatingPopupView(context: Context, private val headerTitle: String) : Fra
 
 		addView(
 			contentContainer,
-			FrameLayout.LayoutParams(
-				ViewGroup.LayoutParams.WRAP_CONTENT,
-				ViewGroup.LayoutParams.WRAP_CONTENT,
+			LayoutParams(
+				LayoutParams.WRAP_CONTENT,
+				LayoutParams.WRAP_CONTENT,
 				Gravity.CENTER
 			)
 		)
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index d10dcc066..1a8df4fa3 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -174,7 +174,7 @@ class CaptureSource(
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
         val view = windowEntry.rootView
 
-        if (windowEntry.isPixelCopyCandidate()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && windowEntry.isPixelCopyCandidate()) {
             val window = windowInspector.findWindow(view)
             if (window != null) {
                 pixelCopy(window, view, windowEntry.rect())?.let {
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
index 0deaada1a..b72d036ee 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
@@ -2,7 +2,6 @@ package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Rect
 import android.os.Build
-import android.text.Layout
 import android.view.View
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
@@ -28,9 +27,6 @@ data class WindowEntry(
     }
 
     fun isPixelCopyCandidate(): Boolean {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return false
-        }
         if (type != WindowType.ACTIVITY) {
             return false
         }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/WindowEntryTest.kt b/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/WindowEntryTest.kt
new file mode 100644
index 000000000..e8a5aca1c
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/capture/WindowEntryTest.kt
@@ -0,0 +1,77 @@
+package com.launchdarkly.observability.replay.capture
+
+import android.os.Build
+import android.view.View
+import android.view.WindowManager
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Assumptions.assumeTrue
+import org.junit.jupiter.api.Test
+import io.mockk.mockk
+
+class WindowEntryTest {
+    private fun createEntry(
+        type: WindowType = WindowType.ACTIVITY,
+        layoutParams: WindowManager.LayoutParams? = null,
+        width: Int = 100,
+        height: Int = 100,
+        screenLeft: Int = 0,
+        screenTop: Int = 0
+    ): WindowEntry {
+        val rootView: View = mockk(relaxed = true)
+        return WindowEntry(
+            rootView = rootView,
+            type = type,
+            layoutParams = layoutParams,
+            width = width,
+            height = height,
+            screenLeft = screenLeft,
+            screenTop = screenTop
+        )
+    }
+
+    @Test
+    fun `non-activity windows are not candidates on O+`() {
+        val entry = createEntry(
+            type = WindowType.DIALOG,
+            layoutParams = WindowManager.LayoutParams()
+        )
+        assertFalse(entry.isPixelCopyCandidate())
+    }
+
+    @Test
+    fun `starting window is not a candidate on O+`() {
+        val lp = WindowManager.LayoutParams().apply {
+            type = WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
+        }
+        val entry = createEntry(
+            type = WindowType.ACTIVITY,
+            layoutParams = lp
+        )
+        assertFalse(entry.isPixelCopyCandidate())
+    }
+
+    @Test
+    fun `secure window is not a candidate on O+`() {
+        val lp = WindowManager.LayoutParams().apply {
+            flags = flags or WindowManager.LayoutParams.FLAG_SECURE
+        }
+        val entry = createEntry(
+            type = WindowType.ACTIVITY,
+            layoutParams = lp
+        )
+        assertFalse(entry.isPixelCopyCandidate())
+    }
+
+    @Test
+    fun `activity non-secure non-starting window is a candidate on O+`() {
+        val lp = WindowManager.LayoutParams() // default: not TYPE_APPLICATION_STARTING, no FLAG_SECURE
+        val entry = createEntry(
+            type = WindowType.ACTIVITY,
+            layoutParams = lp
+        )
+        assertTrue(entry.isPixelCopyCandidate())
+    }
+}
+
+

From 4558bbe3b04572595f09d9b9c526494163eb5dfe Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 12:46:25 -0800
Subject: [PATCH 33/71] Fix warnings

---
 .../replay/capture/CaptureSource.kt              | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index eaa89768b..0814eab5f 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -33,7 +33,7 @@ import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
 
 /**
- * A source of [CaptureEvent]s taken from the most recently resumed [Activity]s window. Captures
+ * A source of [CaptureEvent]s taken from the lowest visible window. Captures
  * are emitted on the [captureFlow] property of this class.
  *
  * @param sessionManager Used to get current session for tagging [CaptureEvent] with session id
@@ -78,7 +78,7 @@ class CaptureSource(
     private suspend fun doCapture(): CaptureEvent? =
         withContext(DispatcherProviderHolder.current.main) {
             // Synchronize with UI rendering frame
-            suspendCancellableCoroutine<Unit> { continuation ->
+            suspendCancellableCoroutine { continuation ->
                 Choreographer.getInstance().postFrameCallback {
                     if (continuation.isActive) {
                         continuation.resume(Unit)
@@ -187,11 +187,11 @@ class CaptureSource(
         return withContext(Dispatchers.Main.immediate) {
             if (!view.isAttachedToWindow || !view.isShown) return@withContext null
 
-            return@withContext canvasDraw(view, windowEntry.rect())
+            return@withContext canvasDraw(view)
         }
     }
 
-    @SuppressLint("NewApi")
+    @SuppressLint("NewApi", "UseKtx")
     private suspend fun pixelCopy(
         window: Window,
         view: View,
@@ -227,10 +227,10 @@ class CaptureSource(
         }
     }
 
+    @SuppressLint("UseKtx")
     private fun canvasDraw(
-        view: View,
-        rect: Rect,
-    ): Bitmap? {
+        view: View
+    ): Bitmap {
         val bitmap = Bitmap.createBitmap(
             view.width,
             view.height,
@@ -287,7 +287,7 @@ class CaptureSource(
      * Applies masking rectangles to the provided [canvas] using the provided [masks].
      *
      * @param canvas The canvas to mask
-     * @param masks rects that will be masked
+     * @param masks areas that will be masked
      */
     private fun drawMasks(canvas: Canvas, masks: List<Mask>) {
         masks.forEach { mask ->

From 7cb314b7910bf5f1f7c63b939a161c390356c3b0 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 13:01:29 -0800
Subject: [PATCH 34/71] fix warnings

---
 .../observability/replay/capture/WindowEntry.kt |  1 -
 .../replay/capture/WindowInspector.kt           | 11 ++++++-----
 .../replay/masking/ComposeMaskTarget.kt         |  3 +--
 .../replay/masking/MaskCollector.kt             | 17 +++++++----------
 .../observability/replay/masking/MaskMatcher.kt |  2 +-
 .../replay/masking/NativeMaskTarget.kt          |  9 ++-------
 .../replay/utils/ViewGraphicsExtenstions.kt     |  1 -
 7 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
index b72d036ee..f39cb2f04 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
@@ -1,7 +1,6 @@
 package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Rect
-import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index 90147efed..c05ec5fb1 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -1,5 +1,6 @@
 package com.launchdarkly.observability.replay.capture
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
@@ -15,7 +16,7 @@ class WindowInspector(private val logger: LDLogger) {
 
     fun appWindows(appContext: Context? = null): List<WindowEntry> {
         val appUid = appContext?.applicationInfo?.uid
-        val views = getRootViews() ?: return emptyList()
+        val views = getRootViews()
         return views.mapNotNull { view ->
             if (appUid != null && view.context.applicationInfo?.uid != appUid) return@mapNotNull null
             if (!view.isAttachedToWindow || !view.isShown) return@mapNotNull null
@@ -50,6 +51,7 @@ class WindowInspector(private val logger: LDLogger) {
      * 2) Reflection to call getWindow() if present
      * 3) Context unwrap to Activity and return activity.window (best-effort fallback)
      */
+    @SuppressLint("PrivateApi")
     fun findWindow(rootView: View): Window? {
         // 1) Try to read a private field "mWindow" (present on DecorView/PopupDecorView)
         try {
@@ -100,6 +102,7 @@ class WindowInspector(private val logger: LDLogger) {
         return null
     }
 
+    @SuppressLint("PrivateApi")
     fun getRootViews(): List<View> {
         return try {
             val wmgClass = Class.forName("android.view.WindowManagerGlobal")
@@ -111,8 +114,7 @@ class WindowInspector(private val logger: LDLogger) {
             }.getOrNull()
 
             if (getRootViewsMethod != null) {
-                val result = getRootViewsMethod.invoke(instance)
-                return when (result) {
+                return when (val result = getRootViewsMethod.invoke(instance)) {
                     is Array<*> -> result.filterIsInstance<View>()
                     is List<*> -> result.filterIsInstance<View>()
                     else -> emptyList()
@@ -125,8 +127,7 @@ class WindowInspector(private val logger: LDLogger) {
             }.getOrNull()
 
             if (mViewsField != null) {
-                val result = mViewsField.get(instance)
-                return when (result) {
+                return when (val result = mViewsField.get(instance)) {
                     is Array<*> -> result.filterIsInstance<View>()
                     is List<*> -> result.filterIsInstance<View>()
                     else -> emptyList()
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index dafce0c8e..cff56182a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -3,7 +3,6 @@ package com.launchdarkly.observability.replay.masking
 import android.view.View
 import androidx.compose.ui.graphics.toAndroidRectF
 import androidx.compose.ui.platform.AbstractComposeView
-import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.semantics.SemanticsNode
 import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.semantics.SemanticsConfiguration
@@ -74,7 +73,7 @@ data class ComposeMaskTarget(
         return config.contains(SemanticsProperties.Text)
     }
 
-    override fun mask(): Mask? {
+    override fun mask(): Mask {
         return Mask(boundsInWindow.toAndroidRectF(), view.id)
     }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index 33c0bcc58..ac494ed52 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -2,11 +2,8 @@ package com.launchdarkly.observability.replay.masking
 
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.ui.graphics.Matrix
 import androidx.compose.ui.platform.AbstractComposeView
-import androidx.compose.ui.platform.ComposeView
 import com.launchdarkly.logging.LDLogger
-import com.launchdarkly.observability.replay.utils.locationOnScreen
 import kotlin.collections.plusAssign
 
 /**
@@ -16,15 +13,15 @@ import kotlin.collections.plusAssign
  */
 class MaskCollector(private val logger: LDLogger) {
     /**
-     * Find sensitive areas from all views in the provided [view].
+     * Find sensitive areas from all views in the provided [root] view.
      *
-     * @return a list of rects that represent sensitive areas that need to be masked
+     * @return a list of masks that represent sensitive areas that need to be masked
      */
     fun collectMasks(root: View, matchers: List<MaskMatcher>): List<Mask> {
         val resultMasks = mutableListOf<Mask>()
-        val matrix = Matrix()
-
-        val (rootX, rootY) = root.locationOnScreen()
+//      TODO: use matrix to calculate final coordinates the will be close to truth in animations
+//        val matrix = Matrix()
+//        val (rootX, rootY) = root.locationOnScreen()
 
         traverse(root, matchers, resultMasks)
         return resultMasks
@@ -45,7 +42,7 @@ class MaskCollector(private val logger: LDLogger) {
     fun traverseNative(view: View, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
         val target = NativeMaskTarget(view)
         if (shouldMask(target, matchers)) {
-            target.mask()?.let { masks += it }
+            masks += target.mask()
         }
 
         if (view !is ViewGroup) return
@@ -75,7 +72,7 @@ class MaskCollector(private val logger: LDLogger) {
         masks: MutableList<Mask>
     ) {
         if (shouldMask(target, matchers)) {
-            target.mask()?.let { masks += it }
+            masks += target.mask()
         }
 
         for (child in target.rootNode.children) {
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
index eedc8d80b..c87b6429e 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
@@ -11,7 +11,7 @@ sealed interface MaskTarget {
     fun isTextInput(): Boolean
     fun isText(): Boolean
     fun isSensitive(sensitiveKeywords: List<String>): Boolean
-    fun mask(): Mask?
+    fun mask(): Mask
     fun hasLDMask(): Boolean
 }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index 8b21a23ac..ffb556783 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -4,7 +4,6 @@ import android.view.View
 import android.widget.EditText
 import android.widget.TextView
 import android.text.method.PasswordTransformationMethod
-import androidx.compose.ui.geometry.Rect as ComposeRect
 import kotlin.text.lowercase
 import com.launchdarkly.observability.R
 import android.graphics.RectF
@@ -46,14 +45,10 @@ data class NativeMaskTarget(
 
         // Fallback to contentDescription check
         val lowerDesc = view.contentDescription?.toString()?.lowercase()
-        if (!lowerDesc.isNullOrEmpty() && sensitiveKeywords.any { keyword -> lowerDesc.contains(keyword) }) {
-            return true
-        }
-
-        return false
+        return !lowerDesc.isNullOrEmpty() && sensitiveKeywords.any { keyword -> lowerDesc.contains(keyword) }
     }
 
-    override fun mask(): Mask? {
+    override fun mask(): Mask {
         val location = IntArray(2)
         view.getLocationInWindow(location)
         val left = location[0].toFloat()
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
index faef4c62f..e440ee46d 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
@@ -10,4 +10,3 @@ fun View.locationOnScreen(): Pair<Float, Float> {
     getLocationOnScreen(loc)
     return loc[0].toFloat() to loc[1].toFloat()
 }
-

From 89ba6c575fac90b3d193ab7c40b7e095af93d406 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 13:26:58 -0800
Subject: [PATCH 35/71] remove ressurectued import

---
 .../com/launchdarkly/observability/replay/capture/WindowEntry.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
index b72d036ee..f39cb2f04 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowEntry.kt
@@ -1,7 +1,6 @@
 package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Rect
-import android.os.Build
 import android.view.View
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING

From 0079a423f60fc7431bf1da5bbbdf0aa01580e791 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 09:25:37 -0800
Subject: [PATCH 36/71] address feedback

---
 .../replay/capture/CaptureSource.kt           | 19 +++++--------------
 .../replay/capture/WindowInspector.kt         |  7 ++++++-
 .../replay/masking/ComposeMaskTarget.kt       |  6 +++++-
 .../replay/masking/MaskCollector.kt           |  4 ++--
 .../replay/masking/MaskMatcher.kt             |  2 +-
 .../replay/masking/NativeMaskTarget.kt        | 17 ++++++++++++++---
 .../replay/utils/ViewGraphicsExtensions.kt    | 12 ++++++++++++
 7 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtensions.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 0814eab5f..02eb08f30 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -1,6 +1,5 @@
 package com.launchdarkly.observability.replay.capture
 
-import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
@@ -16,6 +15,7 @@ import android.view.View
 import android.view.Window
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION
 import android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION
+import androidx.annotation.RequiresApi
 import com.launchdarkly.logging.LDLogger
 import com.launchdarkly.observability.coroutines.DispatcherProviderHolder
 import com.launchdarkly.observability.replay.masking.MaskMatcher
@@ -31,6 +31,7 @@ import java.io.ByteArrayOutputStream
 import kotlin.coroutines.resume
 import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
+import androidx.core.graphics.createBitmap
 
 /**
  * A source of [CaptureEvent]s taken from the lowest visible window. Captures
@@ -190,18 +191,13 @@ class CaptureSource(
             return@withContext canvasDraw(view)
         }
     }
-
-    @SuppressLint("NewApi", "UseKtx")
+    @RequiresApi(Build.VERSION_CODES.O)
     private suspend fun pixelCopy(
         window: Window,
         view: View,
         rect: Rect,
     ): Bitmap? {
-        val bitmap = Bitmap.createBitmap(
-            view.width,
-            view.height,
-            Bitmap.Config.ARGB_8888
-        )
+        val bitmap = createBitmap(view.width, view.height)
 
         return suspendCancellableCoroutine { continuation ->
             val handler = Handler(Looper.getMainLooper())
@@ -227,15 +223,10 @@ class CaptureSource(
         }
     }
 
-    @SuppressLint("UseKtx")
     private fun canvasDraw(
         view: View
     ): Bitmap {
-        val bitmap = Bitmap.createBitmap(
-            view.width,
-            view.height,
-            Bitmap.Config.ARGB_8888
-        )
+        val bitmap = createBitmap(view.width, view.height)
 
         val canvas = Canvas(bitmap)
         view.draw(canvas)
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
index c05ec5fb1..56fb9cc93 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/WindowInspector.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
 import android.graphics.Rect
+import android.os.Build
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
@@ -16,7 +17,11 @@ class WindowInspector(private val logger: LDLogger) {
 
     fun appWindows(appContext: Context? = null): List<WindowEntry> {
         val appUid = appContext?.applicationInfo?.uid
-        val views = getRootViews()
+        val views: List<View> = if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
+            android.view.inspector.WindowInspector.getGlobalWindowViews().map { it.rootView }
+        } else {
+            getRootViews()
+        }
         return views.mapNotNull { view ->
             if (appUid != null && view.context.applicationInfo?.uid != appUid) return@mapNotNull null
             if (!view.isAttachedToWindow || !view.isShown) return@mapNotNull null
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index cff56182a..8bf0caaa7 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -73,7 +73,11 @@ data class ComposeMaskTarget(
         return config.contains(SemanticsProperties.Text)
     }
 
-    override fun mask(): Mask {
+    override fun mask(): Mask? {
+        val rect = boundsInWindow.toAndroidRectF()
+        if (rect.width() <= 0f || rect.height() <= 0f) {
+            return null
+        }
         return Mask(boundsInWindow.toAndroidRectF(), view.id)
     }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index ac494ed52..e060b35fb 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -42,7 +42,7 @@ class MaskCollector(private val logger: LDLogger) {
     fun traverseNative(view: View, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
         val target = NativeMaskTarget(view)
         if (shouldMask(target, matchers)) {
-            masks += target.mask()
+            target.mask()?.let {  masks += it }
         }
 
         if (view !is ViewGroup) return
@@ -72,7 +72,7 @@ class MaskCollector(private val logger: LDLogger) {
         masks: MutableList<Mask>
     ) {
         if (shouldMask(target, matchers)) {
-            masks += target.mask()
+            target.mask()?.let {  masks += it }
         }
 
         for (child in target.rootNode.children) {
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
index c87b6429e..eedc8d80b 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
@@ -11,7 +11,7 @@ sealed interface MaskTarget {
     fun isTextInput(): Boolean
     fun isText(): Boolean
     fun isSensitive(sensitiveKeywords: List<String>): Boolean
-    fun mask(): Mask
+    fun mask(): Mask?
     fun hasLDMask(): Boolean
 }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index ffb556783..af6b7ef04 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -4,6 +4,7 @@ import android.view.View
 import android.widget.EditText
 import android.widget.TextView
 import android.text.method.PasswordTransformationMethod
+import android.text.InputType
 import kotlin.text.lowercase
 import com.launchdarkly.observability.R
 import android.graphics.RectF
@@ -30,6 +31,14 @@ data class NativeMaskTarget(
                 return true
             }
 
+            // Check common password inputType variations seen in EditText/TextView
+            val inputType = view.inputType
+            when (inputType and InputType.TYPE_MASK_VARIATION) {
+                InputType.TYPE_TEXT_VARIATION_PASSWORD,
+                InputType.TYPE_NUMBER_VARIATION_PASSWORD,
+                InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD -> return true
+            }
+
             // Check actual displayed text
             val lowerText = view.text?.toString()?.lowercase()
             if (!lowerText.isNullOrEmpty() && sensitiveKeywords.any { keyword -> lowerText.contains(keyword) }) {
@@ -48,7 +57,11 @@ data class NativeMaskTarget(
         return !lowerDesc.isNullOrEmpty() && sensitiveKeywords.any { keyword -> lowerDesc.contains(keyword) }
     }
 
-    override fun mask(): Mask {
+    override fun mask(): Mask? {
+        if (view.width <= 0 || view.height <= 0) {
+            return null
+        }
+
         val location = IntArray(2)
         view.getLocationInWindow(location)
         val left = location[0].toFloat()
@@ -60,6 +73,4 @@ data class NativeMaskTarget(
     override fun hasLDMask(): Boolean {
         return view.getTag(R.id.ld_mask_tag) as? Boolean ?: false
     }
-
-
 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtensions.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtensions.kt
new file mode 100644
index 000000000..e440ee46d
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtensions.kt
@@ -0,0 +1,12 @@
+package com.launchdarkly.observability.replay.utils
+
+import android.view.View
+
+/**
+ * Returns this view's top-left screen coordinates as a Pair of Floats (x, y).
+ */
+fun View.locationOnScreen(): Pair<Float, Float> {
+    val loc = IntArray(2)
+    getLocationOnScreen(loc)
+    return loc[0].toFloat() to loc[1].toFloat()
+}

From 1180d8ba351fbc7aa689c9df90f261216f17e02f Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 09:27:39 -0800
Subject: [PATCH 37/71] delete renamed

---
 .../replay/utils/ViewGraphicsExtenstions.kt          | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
deleted file mode 100644
index e440ee46d..000000000
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/utils/ViewGraphicsExtenstions.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.launchdarkly.observability.replay.utils
-
-import android.view.View
-
-/**
- * Returns this view's top-left screen coordinates as a Pair of Floats (x, y).
- */
-fun View.locationOnScreen(): Pair<Float, Float> {
-    val loc = IntArray(2)
-    getLocationOnScreen(loc)
-    return loc[0].toFloat() to loc[1].toFloat()
-}

From 04d2537b66d32d93d5f1c1cbcba91e836c6d67b3 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 13:25:10 -0800
Subject: [PATCH 38/71] uncomment

---
 .../observability/replay/masking/MaskCollector.kt         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index e060b35fb..9d6b847ae 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -1,10 +1,12 @@
 package com.launchdarkly.observability.replay.masking
 
+import android.graphics.Matrix
 import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.AbstractComposeView
 import com.launchdarkly.logging.LDLogger
 import kotlin.collections.plusAssign
+import com.launchdarkly.observability.replay.utils.locationOnScreen
 
 /**
  * Collects sensitive screen areas that should be masked in session replay.
@@ -19,9 +21,9 @@ class MaskCollector(private val logger: LDLogger) {
      */
     fun collectMasks(root: View, matchers: List<MaskMatcher>): List<Mask> {
         val resultMasks = mutableListOf<Mask>()
-//      TODO: use matrix to calculate final coordinates the will be close to truth in animations
-//        val matrix = Matrix()
-//        val (rootX, rootY) = root.locationOnScreen()
+
+        val matrix = Matrix()
+        val (rootX, rootY) = root.locationOnScreen()
 
         traverse(root, matchers, resultMasks)
         return resultMasks

From a632d0e5e6c4e2440edb566933254bd3ea517c87 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 15:17:13 -0800
Subject: [PATCH 39/71] works for Native views only

---
 .../replay/capture/CaptureSource.kt           | 11 ++--
 .../observability/replay/masking/Mask.kt      | 36 +++++++++---
 .../replay/masking/MaskCollector.kt           | 58 +++++++++++++++----
 .../replay/masking/MaskMatcher.kt             |  2 +-
 .../replay/masking/NativeMaskTarget.kt        |  5 +-
 5 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 02eb08f30..2ee32d653 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -16,6 +16,7 @@ import android.view.Window
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION
 import android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION
 import androidx.annotation.RequiresApi
+import android.graphics.Path
 import com.launchdarkly.logging.LDLogger
 import com.launchdarkly.observability.coroutines.DispatcherProviderHolder
 import com.launchdarkly.observability.replay.masking.MaskMatcher
@@ -32,6 +33,7 @@ import kotlin.coroutines.resume
 import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
 import androidx.core.graphics.createBitmap
+import com.launchdarkly.observability.replay.masking.draw
 
 /**
  * A source of [CaptureEvent]s taken from the lowest visible window. Captures
@@ -281,14 +283,9 @@ class CaptureSource(
      * @param masks areas that will be masked
      */
     private fun drawMasks(canvas: Canvas, masks: List<Mask>) {
+        val path = Path()
         masks.forEach { mask ->
-            val integerRect = Rect(
-                mask.rect.left.toInt(),
-                mask.rect.top.toInt(),
-                mask.rect.right.toInt(),
-                mask.rect.bottom.toInt()
-            )
-            canvas.drawRect(integerRect, maskPaint)
+            mask.draw(path, canvas, maskPaint)
         }
     }
 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
index faf5e9be6..120dfccf5 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/Mask.kt
@@ -1,21 +1,21 @@
 package com.launchdarkly.observability.replay.masking
+import android.graphics.Path
+import android.graphics.Rect
 import android.graphics.RectF
-import androidx.compose.ui.graphics.Matrix
+import android.graphics.Canvas
+import android.graphics.Paint
 
 data class Mask(
     val rect: RectF,
     val viewId: Int,
-    val points: FloatArray? = null,
-    val matrix: Matrix? = null
-){
+    val points: FloatArray? = null) {
     // Implemented to suppress warning
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is Mask) return false
         return rect == other.rect &&
                 viewId == other.viewId &&
-                points.contentEquals(other.points) &&
-                matrix == other.matrix
+                points.contentEquals(other.points)
     }
 
     // Implemented to suppress warning
@@ -23,7 +23,29 @@ data class Mask(
         var result = rect.hashCode()
         result = 31 * result + viewId
         result = 31 * result + points.contentHashCode()
-        result = 31 * result + (matrix?.hashCode() ?: 0)
         return result
     }
 }
+
+fun Mask.draw(path: Path, canvas: Canvas, paint: Paint) {
+    if (points != null) {
+        val pts = points
+
+        path.reset()
+        path.moveTo(pts[0], pts[1])
+        path.lineTo(pts[2], pts[3])
+        path.lineTo(pts[4], pts[5])
+        path.lineTo(pts[6], pts[7])
+        path.close()
+
+        canvas.drawPath(path, paint)
+    } else {
+        val intRect = Rect(
+            rect.left.toInt(),
+            rect.top.toInt(),
+            rect.right.toInt(),
+            rect.bottom.toInt()
+        )
+        canvas.drawRect(intRect, paint)
+    }
+}
\ No newline at end of file
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index 9d6b847ae..7fddf88bf 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -5,9 +5,16 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.AbstractComposeView
 import com.launchdarkly.logging.LDLogger
+import com.launchdarkly.observability.replay.masking.MaskMatcher
 import kotlin.collections.plusAssign
 import com.launchdarkly.observability.replay.utils.locationOnScreen
 
+data class MaskContext(
+    val matrix: Matrix,
+    val rootX: Float,
+    val rootY: Float,
+    val matchers: List<MaskMatcher>
+)
 /**
  * Collects sensitive screen areas that should be masked in session replay.
  *
@@ -22,26 +29,31 @@ class MaskCollector(private val logger: LDLogger) {
     fun collectMasks(root: View, matchers: List<MaskMatcher>): List<Mask> {
         val resultMasks = mutableListOf<Mask>()
 
-        val matrix = Matrix()
         val (rootX, rootY) = root.locationOnScreen()
+        val context = MaskContext(
+            matrix = Matrix(),
+            rootX = rootX,
+            rootY = rootY,
+            matchers = matchers
+        )
 
-        traverse(root, matchers, resultMasks)
+        traverse(root, context, resultMasks)
         return resultMasks
     }
 
-    fun traverseCompose(view: AbstractComposeView, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
+    fun traverseCompose(view: AbstractComposeView, context: MaskContext, masks: MutableList<Mask>) {
         val target = ComposeMaskTarget.from(view, logger)
         if (target != null) {
-            traverseComposeNodes(target, matchers, masks)
+            traverseComposeNodes(target, context, masks)
         }
 
         for (i in 0 until view.childCount) {
             val child = view.getChildAt(i)
-            traverse(child, matchers, masks)
+            traverse(child, context, masks)
         }
     }
 
-    fun traverseNative(view: View, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
+    fun traverseNative(view: View, context: MaskContext, masks: MutableList<Mask>) {
         val target = NativeMaskTarget(view)
         if (shouldMask(target, matchers)) {
             target.mask()?.let {  masks += it }
@@ -51,17 +63,17 @@ class MaskCollector(private val logger: LDLogger) {
 
         for (i in 0 until view.childCount) {
             val child = view.getChildAt(i)
-            traverse(child, matchers, masks)
+            traverse(child, context, masks)
         }
     }
 
-    fun traverse(view: View, matchers: List<MaskMatcher>, masks: MutableList<Mask>) {
+    fun traverse(view: View, context: MaskContext, masks: MutableList<Mask>) {
         if (!view.isShown) return
 
         if (view is AbstractComposeView) {
-            traverseCompose(view, matchers, masks)
+            traverseCompose(view, context, masks)
         } else if (!view::class.java.name.contains("AndroidComposeView")) {
-            traverseNative(view, matchers, masks)
+            traverseNative(view, context, masks)
         }
     }
 
@@ -70,7 +82,7 @@ class MaskCollector(private val logger: LDLogger) {
      */
     private fun traverseComposeNodes(
         target: ComposeMaskTarget,
-        matchers: List<MaskMatcher>,
+        context: MaskContext,
         masks: MutableList<Mask>
     ) {
         if (shouldMask(target, matchers)) {
@@ -84,7 +96,7 @@ class MaskCollector(private val logger: LDLogger) {
                 config = child.config,
                 boundsInWindow = child.boundsInWindow
             )
-            traverseComposeNodes(childTarget, matchers, masks)
+            traverseComposeNodes(childTarget, context, masks)
         }
     }
 
@@ -96,3 +108,25 @@ class MaskCollector(private val logger: LDLogger) {
             || matchers.any { matcher -> matcher.isMatch(target) }
     }
 }
+
+
+// return 4 points of polygon under transformations
+fun MaskContext.points(view: View): FloatArray {
+    matrix.reset()
+    val width = view.width.toFloat()
+    val height = view.height.toFloat()
+    view.transformMatrixToGlobal(matrix)
+    val pts = floatArrayOf(
+        0f, 0f,
+        width, 0f,
+        width, height,
+        0f, height
+    )
+    matrix.mapPoints(pts)
+    for (i in pts.indices step 2) {
+        pts[i] -= rootX
+        pts[i + 1] -= rootY
+    }
+
+    return pts
+}
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
index eedc8d80b..a2ea3abc1 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskMatcher.kt
@@ -11,7 +11,7 @@ sealed interface MaskTarget {
     fun isTextInput(): Boolean
     fun isText(): Boolean
     fun isSensitive(sensitiveKeywords: List<String>): Boolean
-    fun mask(): Mask?
+    fun mask(context: MaskContext): Mask?
     fun hasLDMask(): Boolean
 }
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index af6b7ef04..d73d80572 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -57,17 +57,18 @@ data class NativeMaskTarget(
         return !lowerDesc.isNullOrEmpty() && sensitiveKeywords.any { keyword -> lowerDesc.contains(keyword) }
     }
 
-    override fun mask(): Mask? {
+    override fun mask(context: MaskContext): Mask? {
         if (view.width <= 0 || view.height <= 0) {
             return null
         }
 
+        val points = context.points(view)
         val location = IntArray(2)
         view.getLocationInWindow(location)
         val left = location[0].toFloat()
         val top = location[1].toFloat()
         val rect = RectF(left, top, left + view.width, top + view.height)
-        return Mask(rect, view.id, matrix = null)
+        return Mask(rect, view.id, points)
     }
 
     override fun hasLDMask(): Boolean {

From 7584f018f208a8174b36376f163c1b825e0c0e1d Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 15:38:19 -0800
Subject: [PATCH 40/71] rotation for XML Views

---
 .../masking/XMLUserFormActivity.kt            |  11 ++
 .../main/res/layout/activity_user_form.xml    | 163 +++++++++---------
 2 files changed, 96 insertions(+), 78 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLUserFormActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLUserFormActivity.kt
index fcec979e6..a15b18830 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLUserFormActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLUserFormActivity.kt
@@ -1,6 +1,10 @@
 package com.example.androidobservability.masking
 
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
 import android.os.Bundle
+import android.view.View
+import android.view.animation.LinearInterpolator
 import android.widget.Button
 import android.widget.EditText
 import android.widget.Toast
@@ -13,6 +17,13 @@ class XMLUserFormActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_user_form)
 
+        val creditCardSection = findViewById<View>(R.id.credit_card_section)
+        ObjectAnimator.ofFloat(creditCardSection, "rotationY", 0f, 360f).apply {
+            duration = 2000
+            repeatCount = ValueAnimator.INFINITE
+            interpolator = LinearInterpolator()
+        }.start()
+
         val inputCardholderName = findViewById<EditText>(R.id.input_cardholder_name)
         val inputCardNumber = findViewById<EditText>(R.id.input_card_number)
         val inputExpiry = findViewById<EditText>(R.id.input_expiry)
diff --git a/e2e/android/app/src/main/res/layout/activity_user_form.xml b/e2e/android/app/src/main/res/layout/activity_user_form.xml
index 809abce0f..7995a9521 100644
--- a/e2e/android/app/src/main/res/layout/activity_user_form.xml
+++ b/e2e/android/app/src/main/res/layout/activity_user_form.xml
@@ -90,101 +90,108 @@
             </LinearLayout>
 
             <!-- Credit Card Section -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Credit Card Information"
-                android:textStyle="bold"
-                android:paddingBottom="8dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Cardholder Name" />
-
-            <EditText
-                android:id="@+id/input_cardholder_name"
+            <LinearLayout
+                android:id="@+id/credit_card_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="e.g., Jane Appleseed"
-                android:inputType="textPersonName"
-                android:paddingBottom="8dp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Card Number" />
+                android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/input_card_number"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="1234 5678 9012 3456"
-                android:inputType="number"
-                android:maxLength="19"
-                android:paddingBottom="8dp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Credit Card Information"
+                    android:textStyle="bold"
+                    android:paddingBottom="8dp" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="2"
-                android:paddingBottom="8dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Cardholder Name" />
 
-                <LinearLayout
-                    android:layout_width="0dp"
+                <EditText
+                    android:id="@+id/input_cardholder_name"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingRight="8dp">
+                    android:hint="e.g., Jane Appleseed"
+                    android:inputType="textPersonName"
+                    android:paddingBottom="8dp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Expiry (MM/YY)" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Card Number" />
 
-                    <EditText
-                        android:id="@+id/input_expiry"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="MM/YY"
-                        android:inputType="number" />
-                </LinearLayout>
+                <EditText
+                    android:id="@+id/input_card_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="1234 5678 9012 3456"
+                    android:inputType="number"
+                    android:maxLength="19"
+                    android:paddingBottom="8dp" />
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingLeft="8dp">
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    android:paddingBottom="8dp">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:text="CVV" />
-
-                    <EditText
-                        android:id="@+id/input_cvv"
-                        android:layout_width="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:paddingRight="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Expiry (MM/YY)" />
+
+                        <EditText
+                            android:id="@+id/input_expiry"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="MM/YY"
+                            android:inputType="number" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:hint="123"
-                        android:inputType="numberPassword"
-                        android:maxLength="4" />
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:paddingLeft="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="CVV" />
+
+                        <EditText
+                            android:id="@+id/input_cvv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="123"
+                            android:inputType="numberPassword"
+                            android:maxLength="4" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="ZIP / Postal Code" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="ZIP / Postal Code" />
 
-            <EditText
-                android:id="@+id/input_zip_code"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="e.g., 94105"
-                android:inputType="textPostalAddress"
-                android:paddingBottom="8dp" />
+                <EditText
+                    android:id="@+id/input_zip_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="e.g., 94105"
+                    android:inputType="textPostalAddress"
+                    android:paddingBottom="8dp" />
+            </LinearLayout>
 
             <Button
                 android:id="@+id/button_save_card"

From 483930b59d6f8f49a97931415102dcd34ddc1da2 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 17:16:09 -0800
Subject: [PATCH 41/71] transformed coordinates for compose

---
 .../replay/masking/ComposeMaskTarget.kt       | 40 +++++++++++++++++++
 .../replay/masking/MaskCollector.kt           | 23 -----------
 .../replay/masking/NativeMaskTarget.kt        | 33 +++++++++++++++
 3 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index 8bf0caaa7..d10fe711b 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -1,6 +1,8 @@
 package com.launchdarkly.observability.replay.masking
 
+import android.os.Build
 import android.view.View
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.toAndroidRectF
 import androidx.compose.ui.platform.AbstractComposeView
 import androidx.compose.ui.semantics.SemanticsNode
@@ -79,6 +81,9 @@ data class ComposeMaskTarget(
             return null
         }
         return Mask(boundsInWindow.toAndroidRectF(), view.id)
+    override fun mask(context: MaskContext): Mask {
+        val points: FloatArray? = points(context)
+        return Mask(boundsInWindow.toAndroidRectF(), view.id, points)
     }
 
     override fun hasLDMask(): Boolean {
@@ -103,6 +108,41 @@ data class ComposeMaskTarget(
         return hasSensitiveDescription
     }
 
+    // return 4 points of polygon under transformations
+    fun points(context: MaskContext): FloatArray? {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            return null
+        }
+
+        val coordinates = rootNode.layoutInfo.coordinates
+        if (!coordinates.isAttached) {
+            return null
+        }
+
+        val size = coordinates.size
+        if (size.width <= 0 || size.height <= 0) {
+            return null
+        }
+
+        val t1 = coordinates.localToWindow(Offset(0f, 0f))
+        val t2 = coordinates.localToWindow(Offset(size.width.toFloat(), 0f))
+        val t3 = coordinates.localToWindow(Offset(size.width.toFloat(), size.height.toFloat()))
+        val t4 = coordinates.localToWindow(Offset(0f, size.height.toFloat()))
+
+        val pts = floatArrayOf(
+            t1.x, t1.y,
+            t2.x, t2.y,
+            t3.x, t3.y,
+            t4.x, t4.y
+        )
+
+        for (i in pts.indices step 2) {
+            pts[i] -= context.rootX
+            pts[i + 1] -= context.rootY
+        }
+
+        return pts
+    }
 }
 
 
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index 7fddf88bf..13204586c 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.ui.platform.AbstractComposeView
 import com.launchdarkly.logging.LDLogger
-import com.launchdarkly.observability.replay.masking.MaskMatcher
 import kotlin.collections.plusAssign
 import com.launchdarkly.observability.replay.utils.locationOnScreen
 
@@ -108,25 +107,3 @@ class MaskCollector(private val logger: LDLogger) {
             || matchers.any { matcher -> matcher.isMatch(target) }
     }
 }
-
-
-// return 4 points of polygon under transformations
-fun MaskContext.points(view: View): FloatArray {
-    matrix.reset()
-    val width = view.width.toFloat()
-    val height = view.height.toFloat()
-    view.transformMatrixToGlobal(matrix)
-    val pts = floatArrayOf(
-        0f, 0f,
-        width, 0f,
-        width, height,
-        0f, height
-    )
-    matrix.mapPoints(pts)
-    for (i in pts.indices step 2) {
-        pts[i] -= rootX
-        pts[i + 1] -= rootY
-    }
-
-    return pts
-}
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index d73d80572..31c74ad7e 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -8,6 +8,7 @@ import android.text.InputType
 import kotlin.text.lowercase
 import com.launchdarkly.observability.R
 import android.graphics.RectF
+import android.os.Build
 
 /**
  *   Native view target
@@ -61,6 +62,8 @@ data class NativeMaskTarget(
         if (view.width <= 0 || view.height <= 0) {
             return null
         }
+    override fun mask(context: MaskContext): Mask {
+        val points = points(context)
 
         val points = context.points(view)
         val location = IntArray(2)
@@ -74,4 +77,34 @@ data class NativeMaskTarget(
     override fun hasLDMask(): Boolean {
         return view.getTag(R.id.ld_mask_tag) as? Boolean ?: false
     }
+
+    // return 4 points of polygon under transformations
+    fun points(context: MaskContext): FloatArray? {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            return null
+        }
+
+        val width = view.width.toFloat()
+        val height = view.height.toFloat()
+        if (width <= 0 || height <= 0) { return null }
+
+        val matrix = context.matrix
+        matrix.reset()
+        view.transformMatrixToGlobal(matrix)
+
+        val pts = floatArrayOf(
+            0f, 0f,
+            width, 0f,
+            width, height,
+            0f, height
+        )
+        matrix.mapPoints(pts)
+        for (i in pts.indices step 2) {
+            pts[i] -= context.rootX
+            pts[i + 1] -= context.rootY
+        }
+
+        return pts
+    }
+
 }

From 30528495f65c9f5075bf4573632478af5a715b12 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 2 Dec 2025 18:09:54 -0800
Subject: [PATCH 42/71] reorder calls

---
 .../observability/replay/capture/CaptureSource.kt           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 2ee32d653..0d9aa3abf 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -80,6 +80,9 @@ class CaptureSource(
      */
     private suspend fun doCapture(): CaptureEvent? =
         withContext(DispatcherProviderHolder.current.main) {
+            val timestamp = System.currentTimeMillis()
+            val session = sessionManager.getSessionId()
+
             // Synchronize with UI rendering frame
             suspendCancellableCoroutine { continuation ->
                 Choreographer.getInstance().postFrameCallback {
@@ -106,8 +109,6 @@ class CaptureSource(
             // TODO: O11Y-625 - see if holding bitmap is more efficient than base64 encoding immediately after compression
             // TODO: O11Y-628 - use captureQuality option for scaling and adjust this bitmap accordingly, may need to investigate power of 2 rounding for performance
             // Create a bitmap with the window dimensions
-            val timestamp = System.currentTimeMillis()
-            val session = sessionManager.getSessionId()
             val baseResult = captureViewResult(baseWindowEntry) ?: return@withContext null
 
             // capture rest of views on top of base
@@ -171,6 +172,7 @@ class CaptureSource(
     private suspend fun captureViewResult(windowEntry: WindowEntry): CaptureResult? {
         val bitmap = captureViewBitmap(windowEntry) ?: return null
         val masks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
+
         return CaptureResult(windowEntry, bitmap, masks)
     }
 

From 50033e843610b5dce228e3e0f1900a3059ae3c81 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 09:59:23 -0800
Subject: [PATCH 43/71] rebase fix

---
 .../replay/masking/ComposeMaskTarget.kt            |  5 ++---
 .../observability/replay/masking/MaskCollector.kt  |  8 ++++----
 .../replay/masking/NativeMaskTarget.kt             | 14 ++------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index d10fe711b..07ffb246d 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -75,13 +75,12 @@ data class ComposeMaskTarget(
         return config.contains(SemanticsProperties.Text)
     }
 
-    override fun mask(): Mask? {
+    override fun mask(context: MaskContext): Mask? {
         val rect = boundsInWindow.toAndroidRectF()
         if (rect.width() <= 0f || rect.height() <= 0f) {
             return null
         }
-        return Mask(boundsInWindow.toAndroidRectF(), view.id)
-    override fun mask(context: MaskContext): Mask {
+
         val points: FloatArray? = points(context)
         return Mask(boundsInWindow.toAndroidRectF(), view.id, points)
     }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
index 13204586c..9f40da3fc 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskCollector.kt
@@ -54,8 +54,8 @@ class MaskCollector(private val logger: LDLogger) {
 
     fun traverseNative(view: View, context: MaskContext, masks: MutableList<Mask>) {
         val target = NativeMaskTarget(view)
-        if (shouldMask(target, matchers)) {
-            target.mask()?.let {  masks += it }
+        if (shouldMask(target, context.matchers)) {
+            target.mask(context)?.let {  masks += it }
         }
 
         if (view !is ViewGroup) return
@@ -84,8 +84,8 @@ class MaskCollector(private val logger: LDLogger) {
         context: MaskContext,
         masks: MutableList<Mask>
     ) {
-        if (shouldMask(target, matchers)) {
-            target.mask()?.let {  masks += it }
+        if (shouldMask(target, context.matchers)) {
+            target.mask(context)?.let {  masks += it }
         }
 
         for (child in target.rootNode.children) {
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index 31c74ad7e..723d63782 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -32,14 +32,6 @@ data class NativeMaskTarget(
                 return true
             }
 
-            // Check common password inputType variations seen in EditText/TextView
-            val inputType = view.inputType
-            when (inputType and InputType.TYPE_MASK_VARIATION) {
-                InputType.TYPE_TEXT_VARIATION_PASSWORD,
-                InputType.TYPE_NUMBER_VARIATION_PASSWORD,
-                InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD -> return true
-            }
-
             // Check actual displayed text
             val lowerText = view.text?.toString()?.lowercase()
             if (!lowerText.isNullOrEmpty() && sensitiveKeywords.any { keyword -> lowerText.contains(keyword) }) {
@@ -62,14 +54,13 @@ data class NativeMaskTarget(
         if (view.width <= 0 || view.height <= 0) {
             return null
         }
-    override fun mask(context: MaskContext): Mask {
-        val points = points(context)
 
-        val points = context.points(view)
+        val points = points(context)
         val location = IntArray(2)
         view.getLocationInWindow(location)
         val left = location[0].toFloat()
         val top = location[1].toFloat()
+
         val rect = RectF(left, top, left + view.width, top + view.height)
         return Mask(rect, view.id, points)
     }
@@ -106,5 +97,4 @@ data class NativeMaskTarget(
 
         return pts
     }
-
 }

From 934607b6049ca9e2e7885cf08ce8cec3910c36c8 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 10:04:51 -0800
Subject: [PATCH 44/71] remove import

---
 .../observability/replay/masking/NativeMaskTarget.kt             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index 723d63782..bcd7036a0 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -4,7 +4,6 @@ import android.view.View
 import android.widget.EditText
 import android.widget.TextView
 import android.text.method.PasswordTransformationMethod
-import android.text.InputType
 import kotlin.text.lowercase
 import com.launchdarkly.observability.R
 import android.graphics.RectF

From 87c34158137175e69f6e38bc88263480d7c91fc9 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 10:15:48 -0800
Subject: [PATCH 45/71] cursor review

---
 .../observability/replay/capture/CaptureSource.kt         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 0d9aa3abf..bdd61baac 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -80,9 +80,6 @@ class CaptureSource(
      */
     private suspend fun doCapture(): CaptureEvent? =
         withContext(DispatcherProviderHolder.current.main) {
-            val timestamp = System.currentTimeMillis()
-            val session = sessionManager.getSessionId()
-
             // Synchronize with UI rendering frame
             suspendCancellableCoroutine { continuation ->
                 Choreographer.getInstance().postFrameCallback {
@@ -91,7 +88,10 @@ class CaptureSource(
                     }
                 }
             }
-            
+
+            val timestamp = System.currentTimeMillis()
+            val session = sessionManager.getSessionId()
+
             val windowsEntries = windowInspector.appWindows()
             if (windowsEntries.isEmpty()) {
                 return@withContext null

From 16a967cc937c46d50803c36db9cfed7449d170bd Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 10:21:31 -0800
Subject: [PATCH 46/71] address feedback

---
 .../observability/replay/masking/ComposeMaskTarget.kt     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index 07ffb246d..dcd76205f 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -123,10 +123,10 @@ data class ComposeMaskTarget(
             return null
         }
 
-        val t1 = coordinates.localToWindow(Offset(0f, 0f))
-        val t2 = coordinates.localToWindow(Offset(size.width.toFloat(), 0f))
-        val t3 = coordinates.localToWindow(Offset(size.width.toFloat(), size.height.toFloat()))
-        val t4 = coordinates.localToWindow(Offset(0f, size.height.toFloat()))
+        val t1 = coordinates.localToScreen(Offset(0f, 0f))
+        val t2 = coordinates.localToScreen(Offset(size.width.toFloat(), 0f))
+        val t3 = coordinates.localToScreen(Offset(size.width.toFloat(), size.height.toFloat()))
+        val t4 = coordinates.localToScreen(Offset(0f, size.height.toFloat()))
 
         val pts = floatArrayOf(
             t1.x, t1.y,

From 278da364d7302e9b157d8a457ff66ab45462369a Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 10:25:19 -0800
Subject: [PATCH 47/71] after before

---
 .../replay/capture/CaptureSource.kt           | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 0d9aa3abf..8d8a967bd 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -50,7 +50,8 @@ class CaptureSource(
     data class CaptureResult(
         val windowEntry: WindowEntry,
         val bitmap: Bitmap,
-        val masks: List<Mask>
+        val beforeMasks: List<Mask>,
+        val afterMasks: List<Mask>
     )
 
     private val _captureEventFlow = MutableSharedFlow<CaptureEvent>()
@@ -112,25 +113,35 @@ class CaptureSource(
             val baseResult = captureViewResult(baseWindowEntry) ?: return@withContext null
 
             // capture rest of views on top of base
-            val pairs = mutableListOf<CaptureResult>()
+            val captureResults = mutableListOf<CaptureResult>()
             var afterBase = false
             for (windowEntry in windowsEntries) {
                 if (afterBase) {
                     captureViewResult(windowEntry)?.let { result ->
-                        pairs.add(result)
+                        captureResults.add(result)
                     }
                 } else if (windowEntry === baseWindowEntry) {
                     afterBase = true
                 }
             }
 
+            // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
-                // off the main thread to avoid blocking the UI thread
-                if (pairs.isNotEmpty() || baseResult.masks.isNotEmpty()) {
+                if (!baseResult.isGood()) {
+                    return@withContext null
+                }
+                for (result in captureResults) {
+                    if (!result.isGood()) {
+                        return@withContext null
+                    }
+                }
+
+                // if need to draw something on base bitmap additionally
+                if (captureResults.isNotEmpty() || baseResult.afterMasks.isNotEmpty()) {
                     val canvas = Canvas(baseResult.bitmap)
                     drawMasks(canvas, baseResult.masks)
 
-                    for (res in pairs) {
+                    for (res in captureResults) {
                         val entry = res.windowEntry
                         val dx = (entry.screenLeft - baseWindowEntry.screenLeft).toFloat()
                         val dy = (entry.screenTop - baseWindowEntry.screenTop).toFloat()
@@ -290,4 +301,17 @@ class CaptureSource(
             mask.draw(path, canvas, maskPaint)
         }
     }
+
+    fun CaptureResult.isGood(): Boolean {
+        if (beforeMasks.count() != afterMasks.count()) {
+            return false
+        }
+
+        if (afterMasks.count() == 0) {
+            return true
+        }
+
+        return true
+    }
 }
+

From caac71493bb0fb9f056e0675433b14fcfa58369d Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 13:51:50 -0800
Subject: [PATCH 48/71] double painting

---
 .../replay/capture/CaptureSource.kt           | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 3234e4e8a..aa3bad639 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -58,7 +58,11 @@ class CaptureSource(
     val captureFlow: SharedFlow<CaptureEvent> = _captureEventFlow.asSharedFlow()
     private val windowInspector = WindowInspector(logger)
     private val maskCollector = MaskCollector(logger)
-    private val maskPaint = Paint().apply {
+    private val beforeMasksPaint = Paint().apply {
+        color = Color.RED
+        style = Paint.Style.FILL
+    }
+    private val afterMaskPaint = Paint().apply {
         color = Color.GRAY
         style = Paint.Style.FILL
     }
@@ -127,11 +131,11 @@ class CaptureSource(
 
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
-                if (!baseResult.isGood()) {
+                if (!baseResult.areMasksStable()) {
                     return@withContext null
                 }
                 for (result in captureResults) {
-                    if (!result.isGood()) {
+                    if (!result.areMasksStable()) {
                         return@withContext null
                     }
                 }
@@ -139,7 +143,7 @@ class CaptureSource(
                 // if need to draw something on base bitmap additionally
                 if (captureResults.isNotEmpty() || baseResult.afterMasks.isNotEmpty()) {
                     val canvas = Canvas(baseResult.bitmap)
-                    drawMasks(canvas, baseResult.masks)
+                    drawMasks(canvas, baseResult)
 
                     for (res in captureResults) {
                         val entry = res.windowEntry
@@ -148,7 +152,7 @@ class CaptureSource(
 
                         canvas.withTranslation(dx, dy) {
                             drawBitmap(res.bitmap, 0f, 0f, null)
-                            drawMasks(canvas, res.masks)
+                            drawMasks(canvas, res)
                         }
                         res.bitmap.recycle()
                     }
@@ -181,10 +185,11 @@ class CaptureSource(
     }
 
     private suspend fun captureViewResult(windowEntry: WindowEntry): CaptureResult? {
+        val beforeMasks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
         val bitmap = captureViewBitmap(windowEntry) ?: return null
-        val masks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
+        val afterMasks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
 
-        return CaptureResult(windowEntry, bitmap, masks)
+        return CaptureResult(windowEntry, bitmap, beforeMasks, afterMasks)
     }
 
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
@@ -295,14 +300,17 @@ class CaptureSource(
      * @param canvas The canvas to mask
      * @param masks areas that will be masked
      */
-    private fun drawMasks(canvas: Canvas, masks: List<Mask>) {
+    private fun drawMasks(canvas: Canvas, captureResult: CaptureResult) {
         val path = Path()
-        masks.forEach { mask ->
-            mask.draw(path, canvas, maskPaint)
+        captureResult.beforeMasks.forEach { mask ->
+            mask.draw(path, canvas, beforeMasksPaint)
+        }
+        captureResult.afterMasks.forEach { mask ->
+            mask.draw(path, canvas, afterMaskPaint)
         }
     }
 
-    fun CaptureResult.isGood(): Boolean {
+    fun CaptureResult.areMasksStable(): Boolean {
         if (beforeMasks.count() != afterMasks.count()) {
             return false
         }

From 164dc72641fc2d87c5a43afe6278b5c1d1d2db0f Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 3 Dec 2025 16:49:45 -0800
Subject: [PATCH 49/71] array based capture works

---
 .../replay/capture/CaptureSource.kt           | 156 +++++++++++++-----
 1 file changed, 114 insertions(+), 42 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index aa3bad639..ce725a231 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -17,6 +17,7 @@ import android.view.WindowManager.LayoutParams.TYPE_APPLICATION
 import android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION
 import androidx.annotation.RequiresApi
 import android.graphics.Path
+import android.util.Log
 import com.launchdarkly.logging.LDLogger
 import com.launchdarkly.observability.coroutines.DispatcherProviderHolder
 import com.launchdarkly.observability.replay.masking.MaskMatcher
@@ -34,6 +35,10 @@ import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
 import androidx.core.graphics.createBitmap
 import com.launchdarkly.observability.replay.masking.draw
+import java.util.Dictionary
+import kotlin.collections.mutableMapOf
+import kotlin.math.abs
+import kotlin.math.max
 
 /**
  * A source of [CaptureEvent]s taken from the lowest visible window. Captures
@@ -50,8 +55,8 @@ class CaptureSource(
     data class CaptureResult(
         val windowEntry: WindowEntry,
         val bitmap: Bitmap,
-        val beforeMasks: List<Mask>,
-        val afterMasks: List<Mask>
+        val beforeMasks: List<Mask>? = null,
+        val afterMasks: List<Mask>? = null
     )
 
     private val _captureEventFlow = MutableSharedFlow<CaptureEvent>()
@@ -68,8 +73,10 @@ class CaptureSource(
     }
 
     private val tiledSignatureManager = TiledSignatureManager()
+
     @Volatile
     private var tiledSignature: TiledSignature? = null
+
     /**
      * Requests a [CaptureEvent] be taken now.
      */
@@ -102,7 +109,8 @@ class CaptureSource(
                 return@withContext null
             }
 
-            val baseWindowEntry = pickBaseWindow(windowsEntries) ?: return@withContext null
+            val baseIndex = pickBaseWindow(windowsEntries) ?: return@withContext null
+            val baseWindowEntry = windowsEntries[baseIndex]
             val rect = baseWindowEntry.rect()
 
             // protect against race condition where decor view has no size
@@ -114,38 +122,53 @@ class CaptureSource(
             // TODO: O11Y-625 - see if holding bitmap is more efficient than base64 encoding immediately after compression
             // TODO: O11Y-628 - use captureQuality option for scaling and adjust this bitmap accordingly, may need to investigate power of 2 rounding for performance
             // Create a bitmap with the window dimensions
-            val baseResult = captureViewResult(baseWindowEntry) ?: return@withContext null
-
-            // capture rest of views on top of base
-            val captureResults = mutableListOf<CaptureResult>()
-            var afterBase = false
-            for (windowEntry in windowsEntries) {
-                if (afterBase) {
-                    captureViewResult(windowEntry)?.let { result ->
-                        captureResults.add(result)
+
+            val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
+            val beforeMasks = mutableMapOf<Int, List<Mask>>()
+            for (i in capturingWindowEntries.indices) {
+                beforeMasks[i] =
+                    maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
+            }
+
+            val captureResults = mutableListOf<CaptureResult?>()
+            for (i in capturingWindowEntries.indices) {
+                val windowEntry = capturingWindowEntries[i]
+                val captureResult = captureViewResult(windowEntry)
+                if (captureResult == null) {
+                    if (i == 0) {
+                        return@withContext null
                     }
-                } else if (windowEntry === baseWindowEntry) {
-                    afterBase = true
+                    beforeMasks.remove(i)
                 }
+
+                captureResults.add(captureResult)
+            }
+            if (captureResults.isEmpty()) {
+                return@withContext null
             }
 
+            val afterMasks = mutableMapOf<Int, List<Mask>>()
+            for (i in capturingWindowEntries.indices) {
+                afterMasks[i] =
+                    maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
+            }
+
+
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
-                if (!baseResult.areMasksStable()) {
+                if (!areMasksMapsStable(beforeMasks, afterMasks)) {
                     return@withContext null
                 }
-                for (result in captureResults) {
-                    if (!result.areMasksStable()) {
-                        return@withContext null
-                    }
-                }
+
+                val baseResult = captureResults[0] ?: return@withContext null
 
                 // if need to draw something on base bitmap additionally
-                if (captureResults.isNotEmpty() || baseResult.afterMasks.isNotEmpty()) {
+                if (captureResults.size > 1 || beforeMasks.isNotEmpty()) {
                     val canvas = Canvas(baseResult.bitmap)
-                    drawMasks(canvas, baseResult)
+                        // drawMasks(canvas, captureResults[0])
 
-                    for (res in captureResults) {
+                    for (res in captureResults.subList(1, captureResults.size)) {
+                        if (res == null) { continue }
                         val entry = res.windowEntry
                         val dx = (entry.screenLeft - baseWindowEntry.screenLeft).toFloat()
                         val dy = (entry.screenTop - baseWindowEntry.screenTop).toFloat()
@@ -170,26 +193,26 @@ class CaptureSource(
             }
         }
 
-    private fun pickBaseWindow(windowsEntries: List<WindowEntry>): WindowEntry? {
-        windowsEntries.firstOrNull {
+    private fun pickBaseWindow(windowsEntries: List<WindowEntry>): Int? {
+        val appIdx = windowsEntries.indexOfFirst {
             val wmType = it.layoutParams?.type ?: 0
-            (wmType == TYPE_APPLICATION || wmType == TYPE_BASE_APPLICATION)
-        }?.let { return it }
+            wmType == TYPE_APPLICATION || wmType == TYPE_BASE_APPLICATION
+        }
+        if (appIdx >= 0) return appIdx
 
-        windowsEntries.firstOrNull { it.type == WindowType.ACTIVITY }?.let { return it }
+        val activityIdx = windowsEntries.indexOfFirst { it.type == WindowType.ACTIVITY }
+        if (activityIdx >= 0) return activityIdx
 
-        windowsEntries.firstOrNull { it.type == WindowType.DIALOG }?.let { return it }
+        val dialogIdx = windowsEntries.indexOfFirst { it.type == WindowType.DIALOG }
+        if (dialogIdx >= 0) return dialogIdx
 
         // Fallback to the first available
-        return windowsEntries.firstOrNull()
+        return if (windowsEntries.isNotEmpty()) 0 else null
     }
 
     private suspend fun captureViewResult(windowEntry: WindowEntry): CaptureResult? {
-        val beforeMasks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
         val bitmap = captureViewBitmap(windowEntry) ?: return null
-        val afterMasks = maskCollector.collectMasks(windowEntry.rootView, maskMatchers)
-
-        return CaptureResult(windowEntry, bitmap, beforeMasks, afterMasks)
+        return CaptureResult(windowEntry, bitmap)
     }
 
     private suspend fun captureViewBitmap(windowEntry: WindowEntry): Bitmap? {
@@ -211,6 +234,7 @@ class CaptureSource(
             return@withContext canvasDraw(view)
         }
     }
+
     @RequiresApi(Build.VERSION_CODES.O)
     private suspend fun pixelCopy(
         window: Window,
@@ -301,17 +325,42 @@ class CaptureSource(
      * @param masks areas that will be masked
      */
     private fun drawMasks(canvas: Canvas, captureResult: CaptureResult) {
-        val path = Path()
-        captureResult.beforeMasks.forEach { mask ->
-            mask.draw(path, canvas, beforeMasksPaint)
+//        val path = Path()
+//        captureResult.beforeMasks.forEach { mask ->
+//            mask.draw(path, canvas, beforeMasksPaint)
+//        }
+//        captureResult.afterMasks.forEach { mask ->
+//            mask.draw(path, canvas, afterMaskPaint)
+//        }
+    }
+
+    fun areMasksMapsStable(
+        beforeMasksMap: Map<Int, List<Mask>>,
+        afterMasksMap: Map<Int, List<Mask>>
+    ): Boolean {
+        if (afterMasksMap.count() != beforeMasksMap.count()) {
+            return false
         }
-        captureResult.afterMasks.forEach { mask ->
-            mask.draw(path, canvas, afterMaskPaint)
+
+        if (afterMasksMap.count() == 0) {
+            return true
         }
+
+        for ((i, before) in beforeMasksMap) {
+            val after = afterMasksMap[i] ?: return false
+            if (!areMasksStable(before, after)) {
+                return false
+            }
+        }
+
+        return true
     }
 
-    fun CaptureResult.areMasksStable(): Boolean {
-        if (beforeMasks.count() != afterMasks.count()) {
+    fun areMasksStable(
+        beforeMasks: List<Mask>,
+        afterMasks: List<Mask>
+    ): Boolean {
+        if (afterMasks.count() != beforeMasks.count()) {
             return false
         }
 
@@ -319,7 +368,30 @@ class CaptureSource(
             return true
         }
 
+        val oneMaskTolerance = 4f
+        val stabilityTolerance = 8f
+        var maxDiff = 0f
+        for ((before, after) in beforeMasks.zip(afterMasks)) {
+            if (before.viewId != after.viewId) {
+                return false
+            }
+            val bPoints = before.points
+            if (bPoints != null) {
+                val aPoints = after.points ?: return false
+                for (i in bPoints.indices) {
+                    val diff = abs(aPoints[i] - bPoints[i])
+                    if (diff > stabilityTolerance) {
+                        return false
+                    }
+                    maxDiff = max(maxDiff, diff)
+                }
+            } else {
+
+            }
+        }
+        if (maxDiff > 0) {
+            Log.i("CaptureSource", "maxDiff = " + maxDiff)
+        }
         return true
     }
 }
-

From 8b2351a51f97de1f75cee93bb6acdb5f7ce424d7 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Thu, 4 Dec 2025 08:42:10 -0800
Subject: [PATCH 50/71] masking first try

---
 .../replay/capture/CaptureSource.kt           | 88 +++++++++++--------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index ce725a231..bbb80f64f 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -63,7 +63,7 @@ class CaptureSource(
     val captureFlow: SharedFlow<CaptureEvent> = _captureEventFlow.asSharedFlow()
     private val windowInspector = WindowInspector(logger)
     private val maskCollector = MaskCollector(logger)
-    private val beforeMasksPaint = Paint().apply {
+    private val beforeMaskPaint = Paint().apply {
         color = Color.RED
         style = Paint.Style.FILL
     }
@@ -156,26 +156,23 @@ class CaptureSource(
 
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
-                if (!areMasksMapsStable(beforeMasks, afterMasks)) {
-                    return@withContext null
-                }
-
                 val baseResult = captureResults[0] ?: return@withContext null
+                val beforeMasks = areMasksMapsStable(beforeMasks, afterMasks) ?: return@withContext null
 
                 // if need to draw something on base bitmap additionally
-                if (captureResults.size > 1 || beforeMasks.isNotEmpty()) {
+                if (captureResults.size > 1 || afterMasks.isNotEmpty()) {
                     val canvas = Canvas(baseResult.bitmap)
-                        // drawMasks(canvas, captureResults[0])
+                    drawMasks(canvas, beforeMasks[0], afterMasks[0])
 
-                    for (res in captureResults.subList(1, captureResults.size)) {
-                        if (res == null) { continue }
+                    for (i in 1 until  captureResults.size) {
+                        val res = captureResults[i] ?: continue
                         val entry = res.windowEntry
                         val dx = (entry.screenLeft - baseWindowEntry.screenLeft).toFloat()
                         val dy = (entry.screenTop - baseWindowEntry.screenTop).toFloat()
 
                         canvas.withTranslation(dx, dy) {
                             drawBitmap(res.bitmap, 0f, 0f, null)
-                            drawMasks(canvas, res)
+                            drawMasks(canvas, beforeMasks[i], afterMasks[i])
                         }
                         res.bitmap.recycle()
                     }
@@ -319,69 +316,86 @@ class CaptureSource(
     }
 
     /**
-     * Applies masking rectangles to the provided [canvas] using the provided [masks].
+     * Applies masking rectangles to the provided [canvas] using the provided [afterMasks].
      *
      * @param canvas The canvas to mask
-     * @param masks areas that will be masked
+     * @param afterMasks areas that will be masked
      */
-    private fun drawMasks(canvas: Canvas, captureResult: CaptureResult) {
-//        val path = Path()
-//        captureResult.beforeMasks.forEach { mask ->
-//            mask.draw(path, canvas, beforeMasksPaint)
-//        }
-//        captureResult.afterMasks.forEach { mask ->
-//            mask.draw(path, canvas, afterMaskPaint)
-//        }
+//    private fun drawMasks(canvas: Canvas, captureResult: CaptureResult) {
+////        val path = Path()
+////        captureResult.beforeMasks.forEach { mask ->
+////            mask.draw(path, canvas, beforeMasksPaint)
+////        }
+////        captureResult.afterMasks.forEach { mask ->
+////            mask.draw(path, canvas, afterMaskPaint)
+////        }
+//    }
+
+    private fun drawMasks(canvas: Canvas, beforeMasks: List<Mask>?, afterMasks: List<Mask>?) {
+        if (afterMasks == null && beforeMasks == null) return
+
+        val path = Path()
+        beforeMasks?.forEach { mask ->
+            mask.draw(path, canvas, beforeMaskPaint)
+        }
+        afterMasks?.forEach { mask ->
+            mask.draw(path, canvas, afterMaskPaint)
+        }
     }
 
     fun areMasksMapsStable(
+
         beforeMasksMap: Map<Int, List<Mask>>,
         afterMasksMap: Map<Int, List<Mask>>
-    ): Boolean {
+    ): Map<Int, List<Mask>>? {
         if (afterMasksMap.count() != beforeMasksMap.count()) {
-            return false
+            return null
         }
 
         if (afterMasksMap.count() == 0) {
-            return true
+            return null
         }
 
+        val result = mutableMapOf<Int, List<Mask>>()
         for ((i, before) in beforeMasksMap) {
-            val after = afterMasksMap[i] ?: return false
-            if (!areMasksStable(before, after)) {
-                return false
-            }
+            val after = afterMasksMap[i] ?: return null
+            val merged = areMasksStable(before, after) ?: return null
+            result[i] = merged
         }
 
-        return true
+        return result
     }
 
     fun areMasksStable(
         beforeMasks: List<Mask>,
         afterMasks: List<Mask>
-    ): Boolean {
+    ): List<Mask>? {
         if (afterMasks.count() != beforeMasks.count()) {
-            return false
+            return null
         }
 
         if (afterMasks.count() == 0) {
-            return true
+            return listOf()
         }
 
-        val oneMaskTolerance = 4f
-        val stabilityTolerance = 8f
+        val oneMaskTolerance = 1f
+        val stabilityTolerance = 40f
         var maxDiff = 0f
+        var resultMasks = mutableListOf<Mask>()
         for ((before, after) in beforeMasks.zip(afterMasks)) {
             if (before.viewId != after.viewId) {
-                return false
+                return null
             }
             val bPoints = before.points
             if (bPoints != null) {
-                val aPoints = after.points ?: return false
+                val aPoints = after.points ?: return null
                 for (i in bPoints.indices) {
                     val diff = abs(aPoints[i] - bPoints[i])
                     if (diff > stabilityTolerance) {
-                        return false
+                        return null
+                    }
+                    if (diff > oneMaskTolerance) {
+                        resultMasks += before
                     }
                     maxDiff = max(maxDiff, diff)
                 }
@@ -392,6 +406,6 @@ class CaptureSource(
         if (maxDiff > 0) {
             Log.i("CaptureSource", "maxDiff = " + maxDiff)
         }
-        return true
+        return resultMasks
     }
 }

From 277ae2e5117e8be4c5847c4b300634a50c4db7df Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 9 Dec 2025 13:01:25 -0800
Subject: [PATCH 51/71] double masking wip

---
 .../androidobservability/BaseApplication.kt   |  2 +-
 .../masking/ComposeUserForm.kt                | 16 +++--
 .../masking/XMLMaskingActivity.kt             |  1 -
 .../replay/capture/CaptureSource.kt           | 69 +++++++++++--------
 .../replay/masking/NativeMaskTarget.kt        |  2 +-
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt b/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
index b2e06473f..24c1f155a 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
@@ -23,7 +23,7 @@ open class BaseApplication : Application() {
     companion object {
         // TODO O11Y-376: Update this credential to be driven by env variable or gradle property
         // Set LAUNCHDARKLY_MOBILE_KEY to your LaunchDarkly SDK mobile key.
-        const val LAUNCHDARKLY_MOBILE_KEY = "MOBILE_KEY_GOES_HERE"
+        const val LAUNCHDARKLY_MOBILE_KEY = "mob-f2aca03d-4a84-4b9d-bc35-db20cbb4ca0a"
     }
 
     var pluginOptions = Options(
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/ComposeUserForm.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/ComposeUserForm.kt
index 2200444ec..26f1174f8 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/ComposeUserForm.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/ComposeUserForm.kt
@@ -89,8 +89,7 @@ fun UserInfoForm(modifier: Modifier = Modifier) {
 	) {
 		Text(
 			text = "User Information Form",
-			style = MaterialTheme.typography.headlineMedium,
-			modifier = Modifier.ldMask()
+			style = MaterialTheme.typography.headlineMedium
 		)
 
 		// Password Section
@@ -112,7 +111,8 @@ fun UserInfoForm(modifier: Modifier = Modifier) {
 					label = { Text("Password") },
 					visualTransformation = PasswordVisualTransformation(),
 					keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
-					modifier = Modifier.fillMaxWidth()
+					modifier = Modifier
+                        .fillMaxWidth()
 				)
 			}
 		}
@@ -160,7 +160,9 @@ fun UserInfoForm(modifier: Modifier = Modifier) {
 					onValueChange = { zipCode = it },
 					label = { Text("ZIP Code") },
 					keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-					modifier = Modifier.fillMaxWidth()
+					modifier = Modifier
+                        .fillMaxWidth()
+                        .ldMask()
 				)
 			}
 		}
@@ -208,8 +210,10 @@ fun UserInfoForm(modifier: Modifier = Modifier) {
 						label = { Text("CVV") },
 						keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
 						visualTransformation = PasswordVisualTransformation(),
-						modifier = Modifier.weight(1f)
-					)
+						modifier = Modifier
+                            .weight(1f)
+                            .ldMask()
+                    )
 				}
 			}
 		}
diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
index 3bca916c1..83da7ef5a 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/masking/XMLMaskingActivity.kt
@@ -11,7 +11,6 @@ import android.widget.Toast
 import android.graphics.Color
 import android.graphics.PixelFormat
 import android.view.Gravity
-import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.FrameLayout
 import android.widget.TextView
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 75000dfef..fcf6cac26 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -90,14 +90,7 @@ class CaptureSource(
      */
     private suspend fun doCapture(): CaptureEvent? =
         withContext(DispatcherProviderHolder.current.main) {
-            // Synchronize with UI rendering frame
-            suspendCancellableCoroutine { continuation ->
-                Choreographer.getInstance().postFrameCallback {
-                    if (continuation.isActive) {
-                        continuation.resume(Unit)
-                    }
-                }
-            }
+
 
             val timestamp = System.currentTimeMillis()
             val session = sessionManager.getSessionId()
@@ -128,6 +121,15 @@ class CaptureSource(
                     maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
             }
 
+            // Synchronize with UI rendering frame
+//            suspendCancellableCoroutine { continuation ->
+//                Choreographer.getInstance().postFrameCallback {
+//                    if (continuation.isActive) {
+//                        continuation.resume(Unit)
+//                    }
+//                }
+//            }
+
             val captureResults = mutableListOf<CaptureResult?>()
             for (i in capturingWindowEntries.indices) {
                 val windowEntry = capturingWindowEntries[i]
@@ -145,13 +147,21 @@ class CaptureSource(
                 return@withContext null
             }
 
+            // Synchronize with UI rendering frame
+            suspendCancellableCoroutine { continuation ->
+                Choreographer.getInstance().postFrameCallback {
+                    if (continuation.isActive) {
+                        continuation.resume(Unit)
+                    }
+                }
+            }
+
             val afterMasks = mutableMapOf<Int, List<Mask>>()
             for (i in capturingWindowEntries.indices) {
                 afterMasks[i] =
                     maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
             }
 
-
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
                 val baseResult = captureResults[0] ?: return@withContext null
@@ -345,13 +355,13 @@ class CaptureSource(
             path.close()
 
             canvas.drawPath(path, paint)
-        } else {
+        } //else {
             maskIntRect.left = mask.rect.left.toInt()
             maskIntRect.top = mask.rect.top.toInt()
             maskIntRect.right = mask.rect.right.toInt()
             maskIntRect.bottom =  mask.rect.bottom.toInt()
             canvas.drawRect(maskIntRect, paint)
-        }
+        //}
     }
 
     fun areMasksMapsStable(
@@ -376,6 +386,7 @@ class CaptureSource(
         return result
     }
 
+    // Check if masks are stable and returns null if not
     fun areMasksStable(
         beforeMasks: List<Mask>,
         afterMasks: List<Mask>
@@ -390,28 +401,32 @@ class CaptureSource(
 
         val oneMaskTolerance = 1f
         val stabilityTolerance = 40f
-        var maxDiff = 0f
-        var resultMasks = mutableListOf<Mask>()
+        val maxDiff = 0f
+        val resultMasks = mutableListOf<Mask>()
         for ((before, after) in beforeMasks.zip(afterMasks)) {
             if (before.viewId != after.viewId) {
                 return null
             }
             val bPoints = before.points
-            if (bPoints != null) {
-                val aPoints = after.points ?: return null
-                for (i in bPoints.indices) {
-                    val diff = abs(aPoints[i] - bPoints[i])
-                    if (diff > stabilityTolerance) {
-                        return null
-                    }
-                    if (diff > oneMaskTolerance) {
-                        resultMasks += before
-                    }
-                    maxDiff = max(maxDiff, diff)
+            //if (bPoints != null) {
+//                val aPoints = after.points ?: return null
+//                for (i in bPoints.indices) {
+//                    val diff = abs(aPoints[i] - bPoints[i])
+//                    if (diff > stabilityTolerance) {
+//                        return null
+//                    }
+//                    //if (diff > oneMaskTolerance) {
+//                        resultMasks += before
+//                    //}
+//                    maxDiff = max(maxDiff, diff)
+//                }
+            //} else {
+                val diff = abs(after.rect.top - before.rect.top)
+                if (diff > stabilityTolerance) {
+                    return null
                 }
-            } else {
-
-            }
+                resultMasks += before
+            //}
         }
         if (maxDiff > 0) {
             Log.i("CaptureSource", "maxDiff = " + maxDiff)
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
index 16521b70a..ed0a81464 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/NativeMaskTarget.kt
@@ -79,7 +79,7 @@ data class NativeMaskTarget(
         if (width <= 0 || height <= 0) { return null }
 
         val matrix = context.matrix
-        matrix.reset()
+        matrix.reset() // reusing matrix for performance
         view.transformMatrixToGlobal(matrix)
 
         val pts = floatArrayOf(

From 238b8bd0bd2ca7dc3df65445efedb83e58aa7c0b Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 10 Dec 2025 15:36:19 -0800
Subject: [PATCH 52/71] wip

---
 .../replay/capture/CaptureSource.kt           | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index fcf6cac26..8f83a16fa 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -115,11 +115,6 @@ class CaptureSource(
             // Create a bitmap with the window dimensions
 
             val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
-            val beforeMasks = mutableMapOf<Int, List<Mask>>()
-            for (i in capturingWindowEntries.indices) {
-                beforeMasks[i] =
-                    maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
-            }
 
             // Synchronize with UI rendering frame
 //            suspendCancellableCoroutine { continuation ->
@@ -130,6 +125,23 @@ class CaptureSource(
 //                }
 //            }
 
+
+
+            // Synchronize with UI rendering frame
+            suspendCancellableCoroutine { continuation ->
+                Choreographer.getInstance().postFrameCallback {
+                    if (continuation.isActive) {
+                        continuation.resume(Unit)
+                    }
+                }
+            }
+
+            val beforeMasks = mutableMapOf<Int, List<Mask>>()
+            for (i in capturingWindowEntries.indices) {
+                beforeMasks[i] =
+                    maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
+            }
+
             val captureResults = mutableListOf<CaptureResult?>()
             for (i in capturingWindowEntries.indices) {
                 val windowEntry = capturingWindowEntries[i]

From 842a8999896d1cbada6f648ed65517fec517f729 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 11:06:51 -0800
Subject: [PATCH 53/71] delete unused

---
 .../observability/replay/capture/CaptureSource.kt     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 8f83a16fa..fc37db87f 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -116,17 +116,6 @@ class CaptureSource(
 
             val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
 
-            // Synchronize with UI rendering frame
-//            suspendCancellableCoroutine { continuation ->
-//                Choreographer.getInstance().postFrameCallback {
-//                    if (continuation.isActive) {
-//                        continuation.resume(Unit)
-//                    }
-//                }
-//            }
-
-
-
             // Synchronize with UI rendering frame
             suspendCancellableCoroutine { continuation ->
                 Choreographer.getInstance().postFrameCallback {

From b80c0db10a5521a8f61a752c9cbc01e086776097 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 11:14:01 -0800
Subject: [PATCH 54/71] uncomment else

---
 .../observability/replay/capture/CaptureSource.kt             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index fc37db87f..7bc3ef7f9 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -356,13 +356,13 @@ class CaptureSource(
             path.close()
 
             canvas.drawPath(path, paint)
-        } //else {
+        } else {
             maskIntRect.left = mask.rect.left.toInt()
             maskIntRect.top = mask.rect.top.toInt()
             maskIntRect.right = mask.rect.right.toInt()
             maskIntRect.bottom =  mask.rect.bottom.toInt()
             canvas.drawRect(maskIntRect, paint)
-        //}
+        }
     }
 
     fun areMasksMapsStable(

From 4720fb0b2ac13e55d50190cd913a0719f974ee49 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 12:14:16 -0800
Subject: [PATCH 55/71] refactor out MaskApplier

---
 .../replay/capture/CaptureSource.kt           | 151 ++----------------
 .../replay/masking/MaskApplier.kt             | 111 +++++++++++++
 2 files changed, 124 insertions(+), 138 deletions(-)
 create mode 100644 sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 7bc3ef7f9..215fc3229 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -2,8 +2,6 @@ package com.launchdarkly.observability.replay.capture
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
 import android.graphics.Rect
 import android.os.Build
 import android.os.Handler
@@ -16,8 +14,6 @@ import android.view.Window
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION
 import android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION
 import androidx.annotation.RequiresApi
-import android.graphics.Path
-import android.util.Log
 import com.launchdarkly.logging.LDLogger
 import com.launchdarkly.observability.coroutines.DispatcherProviderHolder
 import com.launchdarkly.observability.replay.masking.MaskMatcher
@@ -34,9 +30,8 @@ import kotlin.coroutines.resume
 import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
 import androidx.core.graphics.createBitmap
+import com.launchdarkly.observability.replay.masking.MaskApplier
 import kotlin.collections.mutableMapOf
-import kotlin.math.abs
-import kotlin.math.max
 
 /**
  * A source of [CaptureEvent]s taken from the lowest visible window. Captures
@@ -61,14 +56,7 @@ class CaptureSource(
     val captureFlow: SharedFlow<CaptureEvent> = _captureEventFlow.asSharedFlow()
     private val windowInspector = WindowInspector(logger)
     private val maskCollector = MaskCollector(logger)
-    private val beforeMaskPaint = Paint().apply {
-        color = Color.RED
-        style = Paint.Style.FILL
-    }
-    private val afterMaskPaint = Paint().apply {
-        color = Color.GRAY
-        style = Paint.Style.FILL
-    }
+    private val maskApplier = MaskApplier()
 
     private val tiledSignatureManager = TiledSignatureManager()
 
@@ -90,7 +78,14 @@ class CaptureSource(
      */
     private suspend fun doCapture(): CaptureEvent? =
         withContext(DispatcherProviderHolder.current.main) {
-
+            // Synchronize with UI rendering frame
+            suspendCancellableCoroutine { continuation ->
+                Choreographer.getInstance().postFrameCallback {
+                    if (continuation.isActive) {
+                        continuation.resume(Unit)
+                    }
+                }
+            }
 
             val timestamp = System.currentTimeMillis()
             val session = sessionManager.getSessionId()
@@ -116,15 +111,6 @@ class CaptureSource(
 
             val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
 
-            // Synchronize with UI rendering frame
-            suspendCancellableCoroutine { continuation ->
-                Choreographer.getInstance().postFrameCallback {
-                    if (continuation.isActive) {
-                        continuation.resume(Unit)
-                    }
-                }
-            }
-
             val beforeMasks = mutableMapOf<Int, List<Mask>>()
             for (i in capturingWindowEntries.indices) {
                 beforeMasks[i] =
@@ -166,12 +152,12 @@ class CaptureSource(
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
                 val baseResult = captureResults[0] ?: return@withContext null
-                val beforeMasks = areMasksMapsStable(beforeMasks, afterMasks) ?: return@withContext null
+                val beforeMasks = maskApplier.filteredBeforeMasksMap(beforeMasks, afterMasks) ?: return@withContext null
 
                 // if need to draw something on base bitmap additionally
                 if (captureResults.size > 1 || afterMasks.isNotEmpty()) {
                     val canvas = Canvas(baseResult.bitmap)
-                    drawMasks(canvas, beforeMasks[0], afterMasks[0])
+                    maskApplier.drawMasks(canvas, beforeMasks[0], afterMasks[0])
 
                     for (i in 1 until  captureResults.size) {
                         val res = captureResults[i] ?: continue
@@ -181,7 +167,7 @@ class CaptureSource(
 
                         canvas.withTranslation(dx, dy) {
                             drawBitmap(res.bitmap, 0f, 0f, null)
-                            drawMasks(canvas, beforeMasks[i], afterMasks[i])
+                            maskApplier.drawMasks(canvas, beforeMasks[i], afterMasks[i])
                         }
                         res.bitmap.recycle()
                     }
@@ -323,115 +309,4 @@ class CaptureSource(
             }
         }
     }
-
-    /**
-     * Applies masking rectangles to the provided [canvas] using the provided [afterMasks].
-     *
-     * @param canvas The canvas to mask
-     * @param afterMasks areas that will be masked
-     */
-
-    private fun drawMasks(canvas: Canvas, beforeMasks: List<Mask>?, afterMasks: List<Mask>?) {
-        if (afterMasks == null && beforeMasks == null) return
-
-        val path = Path()
-        beforeMasks?.forEach { mask ->
-            drawMask(mask, path, canvas, beforeMaskPaint)
-        }
-        afterMasks?.forEach { mask ->
-            drawMask(mask, path, canvas, afterMaskPaint)
-        }
-    }
-
-    private val maskIntRect = Rect()
-    private fun drawMask(mask: Mask, path: Path, canvas: Canvas, paint: Paint) {
-        if (mask.points != null) {
-            val pts = mask.points
-
-            path.reset()
-            path.moveTo(pts[0], pts[1])
-            path.lineTo(pts[2], pts[3])
-            path.lineTo(pts[4], pts[5])
-            path.lineTo(pts[6], pts[7])
-            path.close()
-
-            canvas.drawPath(path, paint)
-        } else {
-            maskIntRect.left = mask.rect.left.toInt()
-            maskIntRect.top = mask.rect.top.toInt()
-            maskIntRect.right = mask.rect.right.toInt()
-            maskIntRect.bottom =  mask.rect.bottom.toInt()
-            canvas.drawRect(maskIntRect, paint)
-        }
-    }
-
-    fun areMasksMapsStable(
-        beforeMasksMap: Map<Int, List<Mask>>,
-        afterMasksMap: Map<Int, List<Mask>>
-    ): Map<Int, List<Mask>>? {
-        if (afterMasksMap.count() != beforeMasksMap.count()) {
-            return null
-        }
-
-        if (afterMasksMap.count() == 0) {
-            return null
-        }
-
-        val result = mutableMapOf<Int, List<Mask>>()
-        for ((i, before) in beforeMasksMap) {
-            val after = afterMasksMap[i] ?: return null
-            val merged = areMasksStable(before, after) ?: return null
-            result[i] = merged
-        }
-
-        return result
-    }
-
-    // Check if masks are stable and returns null if not
-    fun areMasksStable(
-        beforeMasks: List<Mask>,
-        afterMasks: List<Mask>
-    ): List<Mask>? {
-        if (afterMasks.count() != beforeMasks.count()) {
-            return null
-        }
-
-        if (afterMasks.count() == 0) {
-            return listOf()
-        }
-
-        val oneMaskTolerance = 1f
-        val stabilityTolerance = 40f
-        val maxDiff = 0f
-        val resultMasks = mutableListOf<Mask>()
-        for ((before, after) in beforeMasks.zip(afterMasks)) {
-            if (before.viewId != after.viewId) {
-                return null
-            }
-            val bPoints = before.points
-            //if (bPoints != null) {
-//                val aPoints = after.points ?: return null
-//                for (i in bPoints.indices) {
-//                    val diff = abs(aPoints[i] - bPoints[i])
-//                    if (diff > stabilityTolerance) {
-//                        return null
-//                    }
-//                    //if (diff > oneMaskTolerance) {
-//                        resultMasks += before
-//                    //}
-//                    maxDiff = max(maxDiff, diff)
-//                }
-            //} else {
-                val diff = abs(after.rect.top - before.rect.top)
-                if (diff > stabilityTolerance) {
-                    return null
-                }
-                resultMasks += before
-            //}
-        }
-        if (maxDiff > 0) {
-            Log.i("CaptureSource", "maxDiff = " + maxDiff)
-        }
-        return resultMasks
-    }
 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
new file mode 100644
index 000000000..fec9e5af7
--- /dev/null
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -0,0 +1,111 @@
+package com.launchdarkly.observability.replay.masking
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.Rect
+import kotlin.math.abs
+
+class MaskApplier {
+    private val beforeMaskPaint = Paint().apply {
+        color = Color.RED
+        style = Paint.Style.FILL
+    }
+    private val afterMaskPaint = Paint().apply {
+        color = Color.GRAY
+        style = Paint.Style.FILL
+    }
+
+    private val maskIntRect = Rect()
+    private val path = Path()
+
+    fun drawMasks(canvas: Canvas, beforeMasks: List<Mask>?, afterMasks: List<Mask>?) {
+        if (afterMasks == null && beforeMasks == null) return
+
+        beforeMasks?.forEach { mask ->
+            drawMask(mask, path, canvas, beforeMaskPaint)
+        }
+        afterMasks?.forEach { mask ->
+            drawMask(mask, path, canvas, afterMaskPaint)
+        }
+    }
+
+    private fun drawMask(mask: Mask, path: Path, canvas: Canvas, paint: Paint) {
+        var isRectangle = true
+        if (mask.points != null) {
+            val pts = mask.points
+            isRectangle = pts[0] == pts[6] && pts[1] == pts[3] && pts[2] == pts[4] && pts[5] == pts[7]
+            if (!isRectangle) {
+
+                path.reset()
+                path.moveTo(pts[0], pts[1])
+                path.lineTo(pts[2], pts[3])
+                path.lineTo(pts[4], pts[5])
+                path.lineTo(pts[6], pts[7])
+                path.close()
+
+                canvas.drawPath(path, paint)
+            }
+        }
+
+        if (isRectangle) {
+            maskIntRect.left = mask.rect.left.toInt()
+            maskIntRect.top = mask.rect.top.toInt()
+            maskIntRect.right = mask.rect.right.toInt()
+            maskIntRect.bottom =  mask.rect.bottom.toInt()
+            canvas.drawRect(maskIntRect, paint)
+        }
+    }
+
+    fun filteredBeforeMasksMap(
+        beforeMasksMap: Map<Int, List<Mask>>,
+        afterMasksMap: Map<Int, List<Mask>>
+    ): Map<Int, List<Mask>>? {
+        if (afterMasksMap.count() != beforeMasksMap.count()) {
+            return null
+        }
+
+        if (afterMasksMap.count() == 0) {
+            return null
+        }
+
+        val result = mutableMapOf<Int, List<Mask>>()
+        for ((i, before) in beforeMasksMap) {
+            val after = afterMasksMap[i] ?: return null
+            val merged = filteredBeforeMasks(before, after) ?: return null
+            result[i] = merged
+        }
+
+        return result
+    }
+
+    // Check if masks are stable and returns null if not
+    private fun filteredBeforeMasks(
+        beforeMasks: List<Mask>,
+        afterMasks: List<Mask>
+    ): List<Mask>? {
+        if (afterMasks.count() != beforeMasks.count()) {
+            return null
+        }
+
+        if (afterMasks.count() == 0) {
+            return listOf()
+        }
+
+        val stabilityTolerance = 40f
+        val resultMasks = mutableListOf<Mask>()
+        for ((before, after) in beforeMasks.zip(afterMasks)) {
+            if (before.viewId != after.viewId) {
+                return null
+            }
+            val diff = abs(after.rect.top - before.rect.top)
+            if (diff > stabilityTolerance) {
+                return null
+            }
+            resultMasks += before
+        }
+
+        return resultMasks
+    }
+}
\ No newline at end of file

From d8574cc3da94dc0a6b46aa3e08cf2d7fa89872a4 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 12:17:22 -0800
Subject: [PATCH 56/71] remove mobile key

---
 .../java/com/example/androidobservability/BaseApplication.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt b/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
index e84ba2d6a..17ab3dacf 100644
--- a/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
+++ b/e2e/android/app/src/main/java/com/example/androidobservability/BaseApplication.kt
@@ -21,7 +21,7 @@ open class BaseApplication : Application() {
     companion object {
         // TODO O11Y-376: Update this credential to be driven by env variable or gradle property
         // Set LAUNCHDARKLY_MOBILE_KEY to your LaunchDarkly SDK mobile key.
-        const val LAUNCHDARKLY_MOBILE_KEY = "mob-f2aca03d-4a84-4b9d-bc35-db20cbb4ca0a"
+        const val LAUNCHDARKLY_MOBILE_KEY = "MOBILE_KEY_GOES_HERE"
     }
 
     var observabilityOptions = ObservabilityOptions(

From 556365aa3cde77a6a79cfcb4af125e1d42fa67a6 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 12:22:44 -0800
Subject: [PATCH 57/71] Fix color

---
 .../launchdarkly/observability/replay/masking/MaskApplier.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index fec9e5af7..9f25dee85 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -9,7 +9,7 @@ import kotlin.math.abs
 
 class MaskApplier {
     private val beforeMaskPaint = Paint().apply {
-        color = Color.RED
+        color = Color.DKGRAY
         style = Paint.Style.FILL
     }
     private val afterMaskPaint = Paint().apply {

From 8a97643f77c70911742f8cb76cea88676e44ebdd Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 15:13:18 -0800
Subject: [PATCH 58/71] remove context.root adjustment

---
 .../observability/replay/masking/ComposeMaskTarget.kt        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index 9d1c8cdc3..2c29738ef 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -135,11 +135,6 @@ data class ComposeMaskTarget(
             t4.x, t4.y
         )
 
-        for (i in pts.indices step 2) {
-            pts[i] -= context.rootX
-            pts[i + 1] -= context.rootY
-        }
-
         return pts
     }
 }

From a053d387aaf44b989283a52bdfb54eaff5b11d5c Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 16 Dec 2025 17:28:33 -0800
Subject: [PATCH 59/71] mask stabilizy refactor

---
 .../replay/capture/CaptureSource.kt           | 38 ++++++++++---------
 .../replay/masking/MaskApplier.kt             | 37 +++++++-----------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 215fc3229..92b9eee48 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -48,8 +48,6 @@ class CaptureSource(
     data class CaptureResult(
         val windowEntry: WindowEntry,
         val bitmap: Bitmap,
-        val beforeMasks: List<Mask>? = null,
-        val afterMasks: List<Mask>? = null
     )
 
     private val _captureEventFlow = MutableSharedFlow<CaptureEvent>()
@@ -111,13 +109,10 @@ class CaptureSource(
 
             val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
 
-            val beforeMasks = mutableMapOf<Int, List<Mask>>()
-            for (i in capturingWindowEntries.indices) {
-                beforeMasks[i] =
-                    maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
-            }
+            var beforeMasks = collectMasks(capturingWindowEntries)
 
-            val captureResults = mutableListOf<CaptureResult?>()
+            val captureResults: MutableList<CaptureResult?> = MutableList(capturingWindowEntries.size) { null }
+            var captured = 0
             for (i in capturingWindowEntries.indices) {
                 val windowEntry = capturingWindowEntries[i]
                 val captureResult = captureViewResult(windowEntry)
@@ -125,12 +120,13 @@ class CaptureSource(
                     if (i == 0) {
                         return@withContext null
                     }
-                    beforeMasks.remove(i)
+                    beforeMasks[i] = null
                 }
 
-                captureResults.add(captureResult)
+                captured++
+                captureResults[i] = captureResult
             }
-            if (captureResults.isEmpty()) {
+            if (captured == 0) {
                 return@withContext null
             }
 
@@ -143,16 +139,12 @@ class CaptureSource(
                 }
             }
 
-            val afterMasks = mutableMapOf<Int, List<Mask>>()
-            for (i in capturingWindowEntries.indices) {
-                afterMasks[i] =
-                    maskCollector.collectMasks(capturingWindowEntries[i].rootView, maskMatchers)
-            }
+            val afterMasks = collectMasksFromResults(captureResults)
 
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
                 val baseResult = captureResults[0] ?: return@withContext null
-                val beforeMasks = maskApplier.filteredBeforeMasksMap(beforeMasks, afterMasks) ?: return@withContext null
+                beforeMasks = maskApplier.filteredBeforeMasksMap(beforeMasks, afterMasks) ?: return@withContext null
 
                 // if need to draw something on base bitmap additionally
                 if (captureResults.size > 1 || afterMasks.isNotEmpty()) {
@@ -185,6 +177,18 @@ class CaptureSource(
             }
         }
 
+    private fun collectMasks(capturingWindowEntries: List<WindowEntry>): MutableList<List<Mask>?> {
+        return capturingWindowEntries.map {
+            maskCollector.collectMasks( it.rootView, maskMatchers)
+        }.toMutableList()
+    }
+
+    private fun collectMasksFromResults(captureResults: List<CaptureResult?>): MutableList<List<Mask>?> {
+        return captureResults.map { result ->
+            result?.windowEntry?.rootView?.let { rv -> maskCollector.collectMasks(rv, maskMatchers) }
+        }.toMutableList()
+    }
+
     private fun pickBaseWindow(windowsEntries: List<WindowEntry>): Int? {
         val appIdx = windowsEntries.indexOfFirst {
             val wmType = it.layoutParams?.type ?: 0
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index 9f25dee85..38a5fa7d6 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -32,24 +32,18 @@ class MaskApplier {
     }
 
     private fun drawMask(mask: Mask, path: Path, canvas: Canvas, paint: Paint) {
-        var isRectangle = true
         if (mask.points != null) {
             val pts = mask.points
-            isRectangle = pts[0] == pts[6] && pts[1] == pts[3] && pts[2] == pts[4] && pts[5] == pts[7]
-            if (!isRectangle) {
 
-                path.reset()
-                path.moveTo(pts[0], pts[1])
-                path.lineTo(pts[2], pts[3])
-                path.lineTo(pts[4], pts[5])
-                path.lineTo(pts[6], pts[7])
-                path.close()
+            path.reset()
+            path.moveTo(pts[0], pts[1])
+            path.lineTo(pts[2], pts[3])
+            path.lineTo(pts[4], pts[5])
+            path.lineTo(pts[6], pts[7])
+            path.close()
 
-                canvas.drawPath(path, paint)
-            }
-        }
-
-        if (isRectangle) {
+            canvas.drawPath(path, paint)
+        } else {
             maskIntRect.left = mask.rect.left.toInt()
             maskIntRect.top = mask.rect.top.toInt()
             maskIntRect.right = mask.rect.right.toInt()
@@ -59,19 +53,16 @@ class MaskApplier {
     }
 
     fun filteredBeforeMasksMap(
-        beforeMasksMap: Map<Int, List<Mask>>,
-        afterMasksMap: Map<Int, List<Mask>>
-    ): Map<Int, List<Mask>>? {
-        if (afterMasksMap.count() != beforeMasksMap.count()) {
-            return null
-        }
-
+        beforeMasksMap: List<List<Mask>?>,
+        afterMasksMap: List<List<Mask>?>
+    ): MutableList<List<Mask>?>? {
         if (afterMasksMap.count() == 0) {
             return null
         }
 
-        val result = mutableMapOf<Int, List<Mask>>()
-        for ((i, before) in beforeMasksMap) {
+        val result: MutableList<List<Mask>?> = MutableList(beforeMasksMap.size) { null }
+        for (i in beforeMasksMap.indices) {
+            val before = beforeMasksMap[i] ?: continue
             val after = afterMasksMap[i] ?: return null
             val merged = filteredBeforeMasks(before, after) ?: return null
             result[i] = merged

From feaa22f768281469cf98a0d2c33dd7ebedc3ea6f Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Tue, 6 Jan 2026 15:11:17 -0800
Subject: [PATCH 60/71] no message

---
 rrweb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rrweb b/rrweb
index 9a251bb33..5cdbff5f9 160000
--- a/rrweb
+++ b/rrweb
@@ -1 +1 @@
-Subproject commit 9a251bb33d4f5cbbe3ba8fb3eb6247a211243654
+Subproject commit 5cdbff5f9e1f274d4ace1113b9df73c4fc3197bd

From 5012a1517c0c2d65c84aeb14020b858eb20b702f Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 7 Jan 2026 17:55:37 -0800
Subject: [PATCH 61/71] remove redundant comment

---
 .../launchdarkly/observability/replay/capture/CaptureSource.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index a6aeccb99..11829db24 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -105,7 +105,6 @@ class CaptureSource(
             // TODO: O11Y-625 - optimize memory allocations
             // TODO: O11Y-625 - see if holding bitmap is more efficient than base64 encoding immediately after compression
             // TODO: O11Y-628 - use captureQuality option for scaling and adjust this bitmap accordingly, may need to investigate power of 2 rounding for performance
-            // Create a bitmap with the window dimensions
 
             val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
 

From 8983a0ddbfa428f6d7163f1d622231a9521bfd95 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Wed, 7 Jan 2026 17:58:15 -0800
Subject: [PATCH 62/71] Revert "no message"

This reverts commit feaa22f768281469cf98a0d2c33dd7ebedc3ea6f.
---
 rrweb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rrweb b/rrweb
index 5cdbff5f9..9a251bb33 160000
--- a/rrweb
+++ b/rrweb
@@ -1 +1 @@
-Subproject commit 5cdbff5f9e1f274d4ace1113b9df73c4fc3197bd
+Subproject commit 9a251bb33d4f5cbbe3ba8fb3eb6247a211243654

From adc3d2f42b7b0ee0675470cb3b5bf74d9d72c8e7 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Thu, 8 Jan 2026 16:38:01 -0800
Subject: [PATCH 63/71] address feedback

---
 .../replay/capture/CaptureSource.kt           | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 11829db24..31a191ac8 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -31,7 +31,6 @@ import androidx.core.graphics.withTranslation
 import com.launchdarkly.observability.replay.masking.Mask
 import androidx.core.graphics.createBitmap
 import com.launchdarkly.observability.replay.masking.MaskApplier
-import kotlin.collections.mutableMapOf
 
 /**
  * A source of [CaptureEvent]s taken from the lowest visible window. Captures
@@ -120,6 +119,7 @@ class CaptureSource(
                         return@withContext null
                     }
                     beforeMasks[i] = null
+                    continue
                 }
 
                 captured++
@@ -142,8 +142,17 @@ class CaptureSource(
 
             // off the main thread to avoid blocking the UI thread
             return@withContext withContext(DispatcherProviderHolder.current.default) {
-                val baseResult = captureResults[0] ?: return@withContext null
-                beforeMasks = maskApplier.filteredBeforeMasksMap(beforeMasks, afterMasks) ?: return@withContext null
+                val baseResult = captureResults[0] ?: run {
+                    recycleCaptureResults(captureResults)
+                    return@withContext null
+                }
+
+                beforeMasks = maskApplier.filteredBeforeMasksMap(beforeMasks, afterMasks) ?: run {
+                    // Mask instability is expected during animations/scrolling; ensure we always
+                    // recycle already-captured bitmaps before bailing out to avoid native OOM.
+                    recycleCaptureResults(captureResults)
+                    return@withContext null
+                }
 
                 // if need to draw something on base bitmap additionally
                 if (captureResults.size > 1 || afterMasks.isNotEmpty()) {
@@ -160,13 +169,17 @@ class CaptureSource(
                             drawBitmap(res.bitmap, 0f, 0f, null)
                             maskApplier.drawMasks(canvas, beforeMasks[i], afterMasks[i])
                         }
-                        res.bitmap.recycle()
+                        if (!res.bitmap.isRecycled) {
+                            res.bitmap.recycle()
+                        }
                     }
                 }
 
                 val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
                 if (newSignature != null && newSignature == tiledSignature) {
-                    baseResult.bitmap.recycle()
+                    if (!baseResult.bitmap.isRecycled) {
+                        baseResult.bitmap.recycle()
+                    }
                     // the similar bitmap not send
                     return@withContext null
                 }
@@ -176,6 +189,15 @@ class CaptureSource(
             }
         }
 
+    private fun recycleCaptureResults(captureResults: List<CaptureResult?>) {
+        for (res in captureResults) {
+            val bitmap = res?.bitmap ?: continue
+            if (!bitmap.isRecycled) {
+                bitmap.recycle()
+            }
+        }
+    }
+
     private fun collectMasks(capturingWindowEntries: List<WindowEntry>): MutableList<List<Mask>?> {
         return capturingWindowEntries.map {
             maskCollector.collectMasks( it.rootView, maskMatchers)

From 319c9cca7b4b7819aa6ae918fd939fd68f988d8c Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Thu, 8 Jan 2026 17:32:08 -0800
Subject: [PATCH 64/71] fix cases null cases

---
 .../replay/capture/CaptureSource.kt           |  2 +-
 .../replay/masking/MaskApplier.kt             | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 31a191ac8..396d5f865 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -147,7 +147,7 @@ class CaptureSource(
                     return@withContext null
                 }
 
-                beforeMasks = maskApplier.filteredBeforeMasksMap(beforeMasks, afterMasks) ?: run {
+                beforeMasks = maskApplier.mergeMasksMap(beforeMasks, afterMasks) ?: run {
                     // Mask instability is expected during animations/scrolling; ensure we always
                     // recycle already-captured bitmaps before bailing out to avoid native OOM.
                     recycleCaptureResults(captureResults)
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index 38a5fa7d6..9206ff36e 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -52,27 +52,33 @@ class MaskApplier {
         }
     }
 
-    fun filteredBeforeMasksMap(
+    fun mergeMasksMap(
         beforeMasksMap: List<List<Mask>?>,
         afterMasksMap: List<List<Mask>?>
     ): MutableList<List<Mask>?>? {
-        if (afterMasksMap.count() == 0) {
+        if (afterMasksMap.count() != beforeMasksMap.count()) {
             return null
         }
 
         val result: MutableList<List<Mask>?> = MutableList(beforeMasksMap.size) { null }
         for (i in beforeMasksMap.indices) {
-            val before = beforeMasksMap[i] ?: continue
-            val after = afterMasksMap[i] ?: return null
-            val merged = filteredBeforeMasks(before, after) ?: return null
-            result[i] = merged
+            val before = beforeMasksMap[i]
+            val after = afterMasksMap[i]
+            if (before == null) {
+                if (after == null) continue
+                else return null
+            }
+            if (after != null) {
+                val merged = mergeMasks(before, after) ?: return null
+                result[i] = merged
+            }
         }
 
         return result
     }
 
     // Check if masks are stable and returns null if not
-    private fun filteredBeforeMasks(
+    private fun mergeMasks(
         beforeMasks: List<Mask>,
         afterMasks: List<Mask>
     ): List<Mask>? {

From 1aa24c918ac454d8a0e0e1cdc140301fed33e33f Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Thu, 8 Jan 2026 19:47:33 -0800
Subject: [PATCH 65/71] use pair of masks

---
 .../replay/capture/CaptureSource.kt           | 12 ++---
 .../replay/masking/MaskApplier.kt             | 48 +++++++++++--------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 396d5f865..a08018925 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -147,7 +147,7 @@ class CaptureSource(
                     return@withContext null
                 }
 
-                beforeMasks = maskApplier.mergeMasksMap(beforeMasks, afterMasks) ?: run {
+                val mergedMasks = maskApplier.mergeMasksMap(beforeMasks, afterMasks) ?: run {
                     // Mask instability is expected during animations/scrolling; ensure we always
                     // recycle already-captured bitmaps before bailing out to avoid native OOM.
                     recycleCaptureResults(captureResults)
@@ -155,9 +155,9 @@ class CaptureSource(
                 }
 
                 // if need to draw something on base bitmap additionally
-                if (captureResults.size > 1 || afterMasks.isNotEmpty()) {
+                if (captureResults.size > 1 || mergedMasks.isNotEmpty()) {
                     val canvas = Canvas(baseResult.bitmap)
-                    maskApplier.drawMasks(canvas, beforeMasks[0], afterMasks[0])
+                    maskApplier.drawMasks(canvas, mergedMasks[0])
 
                     for (i in 1 until  captureResults.size) {
                         val res = captureResults[i] ?: continue
@@ -167,7 +167,7 @@ class CaptureSource(
 
                         canvas.withTranslation(dx, dy) {
                             drawBitmap(res.bitmap, 0f, 0f, null)
-                            maskApplier.drawMasks(canvas, beforeMasks[i], afterMasks[i])
+                            maskApplier.drawMasks(canvas, mergedMasks[i])
                         }
                         if (!res.bitmap.isRecycled) {
                             res.bitmap.recycle()
@@ -177,9 +177,7 @@ class CaptureSource(
 
                 val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
                 if (newSignature != null && newSignature == tiledSignature) {
-                    if (!baseResult.bitmap.isRecycled) {
-                        baseResult.bitmap.recycle()
-                    }
+                    recycleCaptureResults(captureResults)
                     // the similar bitmap not send
                     return@withContext null
                 }
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index 9206ff36e..b5c92103d 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -20,14 +20,19 @@ class MaskApplier {
     private val maskIntRect = Rect()
     private val path = Path()
 
-    fun drawMasks(canvas: Canvas, beforeMasks: List<Mask>?, afterMasks: List<Mask>?) {
-        if (afterMasks == null && beforeMasks == null) return
+    fun drawMasks(canvas: Canvas, maskPairsList: List<Pair<Mask, Mask?>>) {
+        if (maskPairsList.count() == 0) return
 
-        beforeMasks?.forEach { mask ->
-            drawMask(mask, path, canvas, beforeMaskPaint)
+        maskPairsList.forEach { pairOfMasks ->
+            drawMask(pairOfMasks, path, canvas)
         }
-        afterMasks?.forEach { mask ->
-            drawMask(mask, path, canvas, afterMaskPaint)
+    }
+
+    private fun drawMask(pairOfMasks: Pair<Mask, Mask?>, path: Path, canvas: Canvas) {
+        val (before, after) = pairOfMasks
+        drawMask(before, path, canvas, beforeMaskPaint)
+        if (after != null) {
+            drawMask(before, path, canvas, afterMaskPaint)
         }
     }
 
@@ -55,22 +60,23 @@ class MaskApplier {
     fun mergeMasksMap(
         beforeMasksMap: List<List<Mask>?>,
         afterMasksMap: List<List<Mask>?>
-    ): MutableList<List<Mask>?>? {
+    ): List<List<Pair<Mask, Mask?>>>? {
         if (afterMasksMap.count() != beforeMasksMap.count()) {
             return null
         }
 
-        val result: MutableList<List<Mask>?> = MutableList(beforeMasksMap.size) { null }
-        for (i in beforeMasksMap.indices) {
-            val before = beforeMasksMap[i]
-            val after = afterMasksMap[i]
-            if (before == null) {
-                if (after == null) continue
-                else return null
-            }
-            if (after != null) {
-                val merged = mergeMasks(before, after) ?: return null
-                result[i] = merged
+        val result = buildList<List<Pair<Mask, Mask?>>>(beforeMasksMap.size) {
+            for (i in beforeMasksMap.indices) {
+                val before = beforeMasksMap[i]
+                val after = afterMasksMap[i]
+                if (before == null) {
+                    if (after == null) continue
+                    else return null
+                }
+                if (after != null) {
+                    val merged = mergeMasks(before, after) ?: return null
+                    add(merged)
+                }
             }
         }
 
@@ -81,7 +87,7 @@ class MaskApplier {
     private fun mergeMasks(
         beforeMasks: List<Mask>,
         afterMasks: List<Mask>
-    ): List<Mask>? {
+    ): List<Pair<Mask, Mask?>>? {
         if (afterMasks.count() != beforeMasks.count()) {
             return null
         }
@@ -91,7 +97,7 @@ class MaskApplier {
         }
 
         val stabilityTolerance = 40f
-        val resultMasks = mutableListOf<Mask>()
+        val resultMasks = mutableListOf<Pair<Mask, Mask?>>()
         for ((before, after) in beforeMasks.zip(afterMasks)) {
             if (before.viewId != after.viewId) {
                 return null
@@ -100,7 +106,7 @@ class MaskApplier {
             if (diff > stabilityTolerance) {
                 return null
             }
-            resultMasks += before
+            resultMasks += Pair(before, after)
         }
 
         return resultMasks

From 50381594f470ac276fdee0ab3e3dd44b9eb665ee Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Thu, 8 Jan 2026 20:38:55 -0800
Subject: [PATCH 66/71] use throwable

---
 .../observability/replay/capture/CaptureSource.kt           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index a08018925..a94f1ff6e 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -107,7 +107,7 @@ class CaptureSource(
 
             val capturingWindowEntries = windowsEntries.subList(baseIndex, windowsEntries.size)
 
-            var beforeMasks = collectMasks(capturingWindowEntries)
+            val beforeMasks = collectMasks(capturingWindowEntries)
 
             val captureResults: MutableList<CaptureResult?> = MutableList(capturingWindowEntries.size) { null }
             var captured = 0
@@ -274,9 +274,9 @@ class CaptureSource(
                         }
                     }, handler
                 )
-            } catch (exp: Exception) {
+            } catch (t: Throwable) {
                 // It could normally happen when view is being closed during screenshot
-                logger.warn("Failed to capture window", exp)
+                logger.warn("Failed to capture window", t)
                 continuation.resume(null)
             }
         }

From c6cfb6d2540c4a2b967defbb4ddaba2c9c520fec Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Fri, 9 Jan 2026 08:53:42 -0800
Subject: [PATCH 67/71] address feedback

---
 .../observability/replay/masking/ComposeMaskTarget.kt |  8 ++++----
 .../observability/replay/masking/MaskApplier.kt       | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
index 2c29738ef..91cd36d6d 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/ComposeMaskTarget.kt
@@ -123,10 +123,10 @@ data class ComposeMaskTarget(
             return null
         }
 
-        val t1 = coordinates.localToScreen(Offset(0f, 0f))
-        val t2 = coordinates.localToScreen(Offset(size.width.toFloat(), 0f))
-        val t3 = coordinates.localToScreen(Offset(size.width.toFloat(), size.height.toFloat()))
-        val t4 = coordinates.localToScreen(Offset(0f, size.height.toFloat()))
+        val t1 = coordinates.localToWindow(Offset(0f, 0f))
+        val t2 = coordinates.localToWindow(Offset(size.width.toFloat(), 0f))
+        val t3 = coordinates.localToWindow(Offset(size.width.toFloat(), size.height.toFloat()))
+        val t4 = coordinates.localToWindow(Offset(0f, size.height.toFloat()))
 
         val pts = floatArrayOf(
             t1.x, t1.y,
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index b5c92103d..4904467b5 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -18,11 +18,11 @@ class MaskApplier {
     }
 
     private val maskIntRect = Rect()
-    private val path = Path()
 
     fun drawMasks(canvas: Canvas, maskPairsList: List<Pair<Mask, Mask?>>) {
         if (maskPairsList.count() == 0) return
 
+        val path = Path()
         maskPairsList.forEach { pairOfMasks ->
             drawMask(pairOfMasks, path, canvas)
         }
@@ -32,7 +32,7 @@ class MaskApplier {
         val (before, after) = pairOfMasks
         drawMask(before, path, canvas, beforeMaskPaint)
         if (after != null) {
-            drawMask(before, path, canvas, afterMaskPaint)
+            drawMask(after, path, canvas, afterMaskPaint)
         }
     }
 
@@ -65,7 +65,7 @@ class MaskApplier {
             return null
         }
 
-        val result = buildList<List<Pair<Mask, Mask?>>>(beforeMasksMap.size) {
+        val result = buildList(beforeMasksMap.size) {
             for (i in beforeMasksMap.indices) {
                 val before = beforeMasksMap[i]
                 val after = afterMasksMap[i]
@@ -102,8 +102,9 @@ class MaskApplier {
             if (before.viewId != after.viewId) {
                 return null
             }
-            val diff = abs(after.rect.top - before.rect.top)
-            if (diff > stabilityTolerance) {
+            val dy = abs(after.rect.top - before.rect.top)
+            val dx = abs(after.rect.left - before.rect.left)
+            if (dy > stabilityTolerance || dx > stabilityTolerance) {
                 return null
             }
             resultMasks += Pair(before, after)

From 64f8cd1a274df4b6c8aac8eb04623bf6a57bc437 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Fri, 9 Jan 2026 09:33:17 -0800
Subject: [PATCH 68/71] address feedback

---
 .../observability/replay/capture/CaptureSource.kt      |  6 +++---
 .../observability/replay/masking/MaskApplier.kt        | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index a94f1ff6e..8fcab111a 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -155,9 +155,9 @@ class CaptureSource(
                 }
 
                 // if need to draw something on base bitmap additionally
-                if (captureResults.size > 1 || mergedMasks.isNotEmpty()) {
+                if (captureResults.size > 1 || (mergedMasks.isNotEmpty() && mergedMasks[0] != null)) {
                     val canvas = Canvas(baseResult.bitmap)
-                    maskApplier.drawMasks(canvas, mergedMasks[0])
+                    mergedMasks[0]?.let { maskApplier.drawMasks(canvas, it) }
 
                     for (i in 1 until  captureResults.size) {
                         val res = captureResults[i] ?: continue
@@ -167,7 +167,7 @@ class CaptureSource(
 
                         canvas.withTranslation(dx, dy) {
                             drawBitmap(res.bitmap, 0f, 0f, null)
-                            maskApplier.drawMasks(canvas, mergedMasks[i])
+                            mergedMasks[i]?.let { maskApplier.drawMasks(canvas, it) }
                         }
                         if (!res.bitmap.isRecycled) {
                             res.bitmap.recycle()
diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index 4904467b5..00c295eb8 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -60,7 +60,7 @@ class MaskApplier {
     fun mergeMasksMap(
         beforeMasksMap: List<List<Mask>?>,
         afterMasksMap: List<List<Mask>?>
-    ): List<List<Pair<Mask, Mask?>>>? {
+    ): List<List<Pair<Mask, Mask?>>?>? {
         if (afterMasksMap.count() != beforeMasksMap.count()) {
             return null
         }
@@ -70,12 +70,16 @@ class MaskApplier {
                 val before = beforeMasksMap[i]
                 val after = afterMasksMap[i]
                 if (before == null) {
-                    if (after == null) continue
-                    else return null
+                    if (after == null) {
+                        add(null)
+                        continue
+                    } else return null
                 }
                 if (after != null) {
                     val merged = mergeMasks(before, after) ?: return null
                     add(merged)
+                } else {
+                    return null
                 }
             }
         }

From 832e2cf10881f99d48e1d6288da15db6230be77a Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Fri, 9 Jan 2026 09:54:08 -0800
Subject: [PATCH 69/71] recycle early

---
 .../replay/capture/CaptureSource.kt           | 128 ++++++++++--------
 1 file changed, 68 insertions(+), 60 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index 8fcab111a..db9699874 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -110,80 +110,80 @@ class CaptureSource(
             val beforeMasks = collectMasks(capturingWindowEntries)
 
             val captureResults: MutableList<CaptureResult?> = MutableList(capturingWindowEntries.size) { null }
-            var captured = 0
-            for (i in capturingWindowEntries.indices) {
-                val windowEntry = capturingWindowEntries[i]
-                val captureResult = captureViewResult(windowEntry)
-                if (captureResult == null) {
-                    if (i == 0) {
-                        return@withContext null
+            try {
+                var captured = 0
+                for (i in capturingWindowEntries.indices) {
+                    val windowEntry = capturingWindowEntries[i]
+                    val captureResult = captureViewResult(windowEntry)
+                    if (captureResult == null) {
+                        if (i == 0) {
+                            return@withContext null
+                        }
+                        beforeMasks[i] = null
+                        continue
                     }
-                    beforeMasks[i] = null
-                    continue
-                }
-
-                captured++
-                captureResults[i] = captureResult
-            }
-            if (captured == 0) {
-                return@withContext null
-            }
 
-            // Synchronize with UI rendering frame
-            suspendCancellableCoroutine { continuation ->
-                Choreographer.getInstance().postFrameCallback {
-                    if (continuation.isActive) {
-                        continuation.resume(Unit)
-                    }
+                    captured++
+                    captureResults[i] = captureResult
                 }
-            }
-
-            val afterMasks = collectMasksFromResults(captureResults)
-
-            // off the main thread to avoid blocking the UI thread
-            return@withContext withContext(DispatcherProviderHolder.current.default) {
-                val baseResult = captureResults[0] ?: run {
-                    recycleCaptureResults(captureResults)
+                if (captured == 0) {
                     return@withContext null
                 }
 
-                val mergedMasks = maskApplier.mergeMasksMap(beforeMasks, afterMasks) ?: run {
-                    // Mask instability is expected during animations/scrolling; ensure we always
-                    // recycle already-captured bitmaps before bailing out to avoid native OOM.
-                    recycleCaptureResults(captureResults)
-                    return@withContext null
+                // Synchronize with UI rendering frame
+                suspendCancellableCoroutine { continuation ->
+                    Choreographer.getInstance().postFrameCallback {
+                        if (continuation.isActive) {
+                            continuation.resume(Unit)
+                        }
+                    }
                 }
 
-                // if need to draw something on base bitmap additionally
-                if (captureResults.size > 1 || (mergedMasks.isNotEmpty() && mergedMasks[0] != null)) {
-                    val canvas = Canvas(baseResult.bitmap)
-                    mergedMasks[0]?.let { maskApplier.drawMasks(canvas, it) }
+                val afterMasks = collectMasksFromResults(captureResults)
 
-                    for (i in 1 until  captureResults.size) {
-                        val res = captureResults[i] ?: continue
-                        val entry = res.windowEntry
-                        val dx = (entry.screenLeft - baseWindowEntry.screenLeft).toFloat()
-                        val dy = (entry.screenTop - baseWindowEntry.screenTop).toFloat()
+                // off the main thread to avoid blocking the UI thread
+                return@withContext withContext(DispatcherProviderHolder.current.default) {
+                    val baseResult = captureResults[0] ?: return@withContext null
 
-                        canvas.withTranslation(dx, dy) {
-                            drawBitmap(res.bitmap, 0f, 0f, null)
-                            mergedMasks[i]?.let { maskApplier.drawMasks(canvas, it) }
+                    val mergedMasks = maskApplier.mergeMasksMap(beforeMasks, afterMasks)
+                        ?: run {
+                            // Mask instability is expected during animations/scrolling; ensure we always
+                            // recycle already-captured bitmaps before bailing out to avoid native OOM.
+                            return@withContext null
                         }
-                        if (!res.bitmap.isRecycled) {
-                            res.bitmap.recycle()
+
+                    // if need to draw something on base bitmap additionally
+                    if (captureResults.size > 1 || (mergedMasks.isNotEmpty() && mergedMasks[0] != null)) {
+                        val canvas = Canvas(baseResult.bitmap)
+                        mergedMasks[0]?.let { maskApplier.drawMasks(canvas, it) }
+
+                        for (i in 1 until captureResults.size) {
+                            val res = captureResults[i] ?: continue
+                            val entry = res.windowEntry
+                            val dx = (entry.screenLeft - baseWindowEntry.screenLeft).toFloat()
+                            val dy = (entry.screenTop - baseWindowEntry.screenTop).toFloat()
+
+                            canvas.withTranslation(dx, dy) {
+                                drawBitmap(res.bitmap, 0f, 0f, null)
+                                mergedMasks[i]?.let { maskApplier.drawMasks(canvas, it) }
+                            }
+                            if (!res.bitmap.isRecycled) {
+                                res.bitmap.recycle()
+                            }
                         }
                     }
-                }
 
-                val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
-                if (newSignature != null && newSignature == tiledSignature) {
-                    recycleCaptureResults(captureResults)
-                    // the similar bitmap not send
-                    return@withContext null
-                }
-                tiledSignature = newSignature
+                    val newSignature = tiledSignatureManager.compute(baseResult.bitmap, 64)
+                    if (newSignature != null && newSignature == tiledSignature) {
+                        // the similar bitmap not send
+                        return@withContext null
+                    }
+                    tiledSignature = newSignature
 
-                createCaptureEvent(baseResult.bitmap, rect, timestamp, session)
+                    createCaptureEvent(baseResult.bitmap, rect, timestamp, session)
+                }
+            } finally {
+                recycleCaptureResults(captureResults)
             }
         }
 
@@ -258,7 +258,10 @@ class CaptureSource(
     ): Bitmap? {
         val bitmap = createBitmapForView(view) ?: return null
 
-        return suspendCancellableCoroutine { continuation ->
+        val result = suspendCancellableCoroutine { continuation ->
+            continuation.invokeOnCancellation {
+                bitmap.recycle()
+            }
             val handler = Handler(Looper.getMainLooper())
             try {
                 PixelCopy.request(
@@ -280,6 +283,11 @@ class CaptureSource(
                 continuation.resume(null)
             }
         }
+
+        if (result == null && !bitmap.isRecycled) {
+            bitmap.recycle()
+        }
+        return result
     }
 
     private fun canvasDraw(

From 356c48414a9e7bf25c7f683cb06aabb308badaeb Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Fri, 9 Jan 2026 10:16:13 -0800
Subject: [PATCH 70/71] another recycle

---
 .../observability/replay/capture/CaptureSource.kt    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
index db9699874..4b717e264 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/capture/CaptureSource.kt
@@ -259,18 +259,18 @@ class CaptureSource(
         val bitmap = createBitmapForView(view) ?: return null
 
         val result = suspendCancellableCoroutine { continuation ->
-            continuation.invokeOnCancellation {
-                bitmap.recycle()
-            }
             val handler = Handler(Looper.getMainLooper())
             try {
                 PixelCopy.request(
                     window,
                     rect,
                     bitmap,
-                    { result ->
-                        if (!continuation.isActive) return@request
-                        if (result == PixelCopy.SUCCESS) {
+                    { copyResult ->
+                        if (!continuation.isActive) {
+                            bitmap.recycle()
+                            return@request
+                        }
+                        if (copyResult == PixelCopy.SUCCESS) {
                             continuation.resume(bitmap)
                         } else {
                             continuation.resume(null)

From 5bff2cd596d6b0c356b3c4ece61617231d104915 Mon Sep 17 00:00:00 2001
From: Andrey Belonogov <abelonogov@launchdarkly.com>
Date: Fri, 9 Jan 2026 11:03:00 -0800
Subject: [PATCH 71/71] Apply suggestion from @agrognetti

Co-authored-by: Agustin Grognetti <agrognetti@launchdarkly.com>
---
 .../launchdarkly/observability/replay/masking/MaskApplier.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
index 00c295eb8..987a7b9c7 100644
--- a/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
+++ b/sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/masking/MaskApplier.kt
@@ -20,7 +20,7 @@ class MaskApplier {
     private val maskIntRect = Rect()
 
     fun drawMasks(canvas: Canvas, maskPairsList: List<Pair<Mask, Mask?>>) {
-        if (maskPairsList.count() == 0) return
+        if (maskPairsList.isEmpty()) return
 
         val path = Path()
         maskPairsList.forEach { pairOfMasks ->