Merge pull request #3561 from DataDog/jmoskovich/fix-background-colors

Fix regression of missing tinted backgrounds

Author: jonathanmos

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/recorder/mapper/AndroidMDrawableToColorMapper.kt

@@ -136,11 +136,11 @@ internal open class AndroidMDrawableToColorMapper(
 
     @RequiresApi(Build.VERSION_CODES.N)
     internal fun resolveGradientDrawableNPlus(drawable: GradientDrawable): Int? {
-        return resolveGradientFillColor(drawable)?.let { resolvedColor ->
-            val colorAlpha = (resolvedColor ushr ALPHA_SHIFT_ANDROID) and MAX_ALPHA_VALUE
-            val fillAlpha = (colorAlpha * drawable.alpha) / MAX_ALPHA_VALUE
-            if (fillAlpha == 0) null else mergeColorAndAlpha(resolvedColor, fillAlpha)
-        }
+        val resolvedColor = resolveGradientFillColor(drawable)
+        if (resolvedColor == null || drawable.colorFilter == null) return null
+        val colorAlpha = (resolvedColor ushr ALPHA_SHIFT_ANDROID) and MAX_ALPHA_VALUE
+        val fillAlpha = (colorAlpha * drawable.alpha) / MAX_ALPHA_VALUE
+        return if (fillAlpha == 0) null else mergeColorAndAlpha(resolvedColor, fillAlpha)
     }
 
     @Suppress("SwallowedException")

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/recorder/mapper/AndroidQDrawableToColorMapper.kt

@@ -28,19 +28,17 @@ internal open class AndroidQDrawableToColorMapper(
 ) : AndroidMDrawableToColorMapper(extensionMappers) {
 
     override fun resolveGradientDrawable(drawable: GradientDrawable, internalLogger: InternalLogger): Int? {
-        val resolvedColor = resolveGradientFillColor(drawable) ?: return null
+        val resolvedColor = resolveGradientFillColor(drawable)
+        val colorFilter = resolveGradientColorFilter(drawable)
+        if (resolvedColor == null || colorFilter == null) return null
         val colorAlpha = (resolvedColor ushr ALPHA_SHIFT_ANDROID) and MAX_ALPHA_VALUE
         val fillAlpha = (colorAlpha * drawable.alpha) / MAX_ALPHA_VALUE
-        val colorFilter = resolveGradientColorFilter(drawable)
-        val fillColor = if (colorFilter != null) {
-            resolveBlendModeColorFilter(resolvedColor, colorFilter, internalLogger)
-        } else {
-            resolvedColor
-        }
+        val fillColor = resolveBlendModeColorFilter(resolvedColor, colorFilter, internalLogger)
         return if (fillAlpha == 0) null else mergeColorAndAlpha(fillColor, fillAlpha)
     }
 
-    protected open fun resolveGradientColorFilter(drawable: GradientDrawable): ColorFilter? = drawable.colorFilter
+    protected open fun resolveGradientColorFilter(drawable: GradientDrawable): ColorFilter? =
+        drawable.colorFilter
 
     /**
      * This is an oversimplification as the result image would only have some

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/recorder/mapper/AndroidMDrawableToColorMapperTest.kt

@@ -153,7 +153,7 @@ open class AndroidMDrawableToColorMapperTest {
     }
 
     @Test
-    fun `M map GradientDrawable to fill paint's color W mapDrawableToColor()`(
+    open fun `M map GradientDrawable to fill paint's color W mapDrawableToColor()`(
         @IntForgery drawableColor: Int
     ) {
         // Given
@@ -283,20 +283,20 @@ open class AndroidMDrawableToColorMapperTest {
     }
 
     @Test
-    fun `M map GradientDrawable to fill color W resolveGradientDrawableNPlus() {public API path}`(
+    fun `M return null W resolveGradientDrawableNPlus() {public API path, no color filter}`(
         @IntForgery fillColor: Int
     ) {
         // Given
         val baseAlpha = (fillColor.toLong() and 0xFF000000) shr 24
         assumeTrue(baseAlpha != 0L)
         val testableMMapper = TestableMMapper().apply { fakeResolvedColor = fillColor }
-        val gradientDrawable = GradientDrawable()
+        val gradientDrawable = GradientDrawable() // colorFilter is null by default
 
         // When
         val result = testableMMapper.resolveGradientDrawableNPlus(gradientDrawable)
 
         // Then
-        assertThat(result).isEqualTo(fillColor)
+        assertThat(result).isNull()
     }
 
     @Test

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/recorder/mapper/AndroidQDrawableToColorMapperTest.kt

@@ -144,6 +144,45 @@ class AndroidQDrawableToColorMapperTest : AndroidMDrawableToColorMapperTest() {
         assertThat(result).isNull()
     }
 
+    @Test
+    fun `M return null W mapDrawableToColor {no accessible color filter}`(
+        @IntForgery fillColor: Int
+    ) {
+        // When drawable.colorFilter is null (e.g. tint applied via DrawableCompat.setTintList,
+        // which stores it in the blocked private Drawable.mTintFilter on API 28+), the mapper
+        // returns null so the image wireframe path captures the actual tinted appearance.
+        val baseAlpha = (fillColor.toLong() and 0xFF000000) shr 24
+        assumeTrue(baseAlpha != 0L)
+        testableMapper.fakeResolvedColor = fillColor
+        testableMapper.fakeColorFilter = null
+        val gradientDrawable = GradientDrawable()
+
+        val result = testedMapper.mapDrawableToColor(gradientDrawable, mockInternalLogger)
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    override fun `M map GradientDrawable to fill paint's color W mapDrawableToColor()`(
+        @IntForgery drawableColor: Int
+    ) {
+        // On Q+, when no color filter is accessible (drawable.colorFilter is null), the mapper
+        // returns null regardless of the fill color so the image wireframe path is used instead.
+        val baseAlpha = (drawableColor.toLong() and 0xFF000000) shr 24
+        assumeTrue(baseAlpha != 0L)
+        val mockFillPaint = mock<Paint>().apply {
+            whenever(this.color) doReturn (drawableColor and 0xFFFFFF)
+            whenever(this.alpha) doReturn baseAlpha.toInt()
+        }
+        val gradientDrawable = GradientDrawable().apply {
+            AndroidMDrawableToColorMapper.fillPaintField?.set(this, mockFillPaint)
+        }
+
+        val result = testedMapper.mapDrawableToColor(gradientDrawable, mockInternalLogger)
+
+        assertThat(result).isNull()
+    }
+
     // Seam to avoid calling API 24+ methods on the test JVM; falls back to parent-injected fillPaintField when fakeResolvedColor is null.
     private class TestableQMapper : AndroidQDrawableToColorMapper() {
         var fakeResolvedColor: Int? = null