Skip to content

Commit b2c9bae

Browse files
ambushworkambushwork
committed
Merge branch 'develop' into yl/merge-develop-into-release
2 parents 2383221 + bcfc7e9 commit b2c9bae

File tree

58 files changed

+793
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+793
-111
lines changed

‎.gitlab-ci.yml‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ include:
44
# SETUP
55

66
variables:
7-
CURRENT_CI_IMAGE: "13"
8-
CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android:$CURRENT_CI_IMAGE
7+
CURRENT_CI_IMAGE: "14"
8+
CI_IMAGE_DOCKER: registry.ddbuild.io/ci/dd-sdk-android:$CURRENT_CI_IMAGE
99
GIT_DEPTH: 5
1010

1111
DD_SERVICE: "dd-sdk-android"
@@ -32,16 +32,8 @@ stages:
3232
- notify
3333

3434
.snippets:
35-
install-android-sdk:
36-
- curl -sSL -o commandlinetools.zip https://dl.google.com/android/repository/$ANDROID_SDK_VERSION.zip
37-
- rm -rf ~/android_sdk
38-
- rm -rf ~/cmdline-tools
39-
- unzip -q commandlinetools -d ~/
40-
- mkdir -p ~/android_sdk/cmdline-tools/latest
41-
- mv ~/cmdline-tools/* ~/android_sdk/cmdline-tools/latest
42-
- rm ./commandlinetools.zip
43-
- export ANDROID_HOME="$HOME/android_sdk/"
44-
- export ANDROID_SDK_ROOT="$HOME/android_sdk/"
35+
# macOS AMI will already have cmdline-tools installed
36+
install-android-api-components:
4537
- echo y | ~/android_sdk/cmdline-tools/latest/bin/sdkmanager --install "emulator"
4638
- echo y | ~/android_sdk/cmdline-tools/latest/bin/sdkmanager --install "platform-tools"
4739
- echo y | ~/android_sdk/cmdline-tools/latest/bin/sdkmanager --install "$ANDROID_PLATFORM"
@@ -225,7 +217,7 @@ test:kover:
225217
# the steps in this section should reflect our test pyramid strategy
226218

227219
test-pyramid:core-it-min-api:
228-
tags: [ "macos:sonoma" ]
220+
tags: [ "macos:sonoma", "specific:true" ]
229221
stage: test-pyramid
230222
timeout: 1h
231223
variables:
@@ -234,11 +226,11 @@ test-pyramid:core-it-min-api:
234226
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
235227
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
236228
script:
237-
- !reference [.snippets, install-android-sdk]
229+
- !reference [.snippets, install-android-api-components]
238230
- !reference [.snippets, run-core-it-instrumented]
239231

240232
test-pyramid:core-it-latest-api:
241-
tags: [ "macos:sonoma" ]
233+
tags: [ "macos:sonoma", "specific:true" ]
242234
stage: test-pyramid
243235
timeout: 1h
244236
variables:
@@ -247,11 +239,11 @@ test-pyramid:core-it-latest-api:
247239
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
248240
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
249241
script:
250-
- !reference [.snippets, install-android-sdk]
242+
- !reference [.snippets, install-android-api-components]
251243
- !reference [.snippets, run-core-it-instrumented]
252244

253245
test-pyramid:core-it-median-api:
254-
tags: [ "macos:sonoma" ]
246+
tags: [ "macos:sonoma", "specific:true" ]
255247
stage: test-pyramid
256248
timeout: 1h
257249
variables:
@@ -260,7 +252,7 @@ test-pyramid:core-it-median-api:
260252
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
261253
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
262254
script:
263-
- !reference [.snippets, install-android-sdk]
255+
- !reference [.snippets, install-android-api-components]
264256
- !reference [.snippets, run-core-it-instrumented]
265257

266258
test-pyramid:single-fit-logs:
@@ -329,7 +321,7 @@ test-pyramid:single-fit-trace:
329321
# RUN INSTRUMENTED TESTS ON MIN API (21), LATEST API (34) and MEDIAN API (28)
330322

331323
test-pyramid:legacy-integration-instrumented-min-api:
332-
tags: [ "macos:sonoma" ]
324+
tags: [ "macos:sonoma", "specific:true" ]
333325
stage: test-pyramid
334326
timeout: 1h
335327
variables:
@@ -338,11 +330,11 @@ test-pyramid:legacy-integration-instrumented-min-api:
338330
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
339331
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
340332
script:
341-
- !reference [.snippets, install-android-sdk]
333+
- !reference [.snippets, install-android-api-components]
342334
- !reference [.snippets, run-legacy-integration-instrumented]
343335

344336
test-pyramid:legacy-integration-instrumented-latest-api:
345-
tags: [ "macos:sonoma" ]
337+
tags: [ "macos:sonoma", "specific:true" ]
346338
stage: test-pyramid
347339
timeout: 1h
348340
variables:
@@ -351,11 +343,11 @@ test-pyramid:legacy-integration-instrumented-latest-api:
351343
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
352344
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
353345
script:
354-
- !reference [.snippets, install-android-sdk]
346+
- !reference [.snippets, install-android-api-components]
355347
- !reference [.snippets, run-legacy-integration-instrumented]
356348

357349
test-pyramid:legacy-integration-instrumented-median-api:
358-
tags: [ "macos:sonoma" ]
350+
tags: [ "macos:sonoma", "specific:true" ]
359351
stage: test-pyramid
360352
timeout: 1h
361353
variables:
@@ -364,7 +356,7 @@ test-pyramid:legacy-integration-instrumented-median-api:
364356
ANDROID_PLATFORM: "platforms;android-$ANDROID_API"
365357
ANDROID_BUILD_TOOLS: "build-tools;$ANDROID_API.0.0"
366358
script:
367-
- !reference [.snippets, install-android-sdk]
359+
- !reference [.snippets, install-android-api-components]
368360
- !reference [.snippets, run-legacy-integration-instrumented]
369361

370362
test-pyramid:detekt-api-coverage:

‎Dockerfile.gitlab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN set -x \
2525
&& apt-get -y clean \
2626
&& rm -rf /var/lib/apt/lists/*
2727

28-
ENV GRADLE_VERSION 8.9
28+
ENV GRADLE_VERSION 8.10.2
2929
ENV ANDROID_COMPILE_SDK 35
3030
ENV ANDROID_BUILD_TOOLS 35.0.0
3131
ENV ANDROID_SDK_TOOLS 11076708

‎buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object AndroidConfig {
2020
const val MIN_SDK_FOR_WEAR = 23
2121
const val BUILD_TOOLS_VERSION = "35.0.0"
2222

23-
val VERSION = Version(2, 15, 0, Version.Type.Release)
23+
val VERSION = Version(2, 16, 0, Version.Type.Snapshot)
2424
}
2525

2626
// TODO RUM-628 Switch to Java 17 bytecode

‎detekt_custom.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,7 @@ datadog:
10011001
- "kotlin.collections.listOf(com.datadog.android.rum.model.ResourceEvent.Interface)"
10021002
- "kotlin.collections.listOf(com.datadog.android.rum.model.ViewEvent.Interface)"
10031003
- "kotlin.collections.listOf(com.datadog.android.sessionreplay.internal.recorder.DefaultOptionSelectorDetector)"
1004+
- "kotlin.collections.listOf(com.datadog.android.sessionreplay.material.internal.MaterialDrawableToColorMapper)"
10041005
- "kotlin.collections.listOf(com.datadog.android.sessionreplay.material.internal.MaterialOptionSelectorDetector)"
10051006
- "kotlin.collections.listOf(com.datadog.android.sessionreplay.model.MobileSegment.MobileRecord.ViewEndRecord)"
10061007
- "kotlin.collections.listOf(com.datadog.android.sessionreplay.model.MobileSegment.Wireframe)"

‎features/dd-sdk-android-session-replay-material/api/apiSurface‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
class com.datadog.android.sessionreplay.material.MaterialExtensionSupport : com.datadog.android.sessionreplay.ExtensionSupport
22
override fun getCustomViewMappers(): List<com.datadog.android.sessionreplay.MapperTypeWrapper<*>>
33
override fun getOptionSelectorDetectors(): List<com.datadog.android.sessionreplay.recorder.OptionSelectorDetector>
4+
override fun getCustomDrawableMapper(): List<com.datadog.android.sessionreplay.utils.DrawableToColorMapper>

‎features/dd-sdk-android-session-replay-material/api/dd-sdk-android-session-replay-material.api‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
public final class com/datadog/android/sessionreplay/material/MaterialExtensionSupport : com/datadog/android/sessionreplay/ExtensionSupport {
22
public fun <init> ()V
3+
public fun getCustomDrawableMapper ()Ljava/util/List;
34
public fun getCustomViewMappers ()Ljava/util/List;
45
public fun getOptionSelectorDetectors ()Ljava/util/List;
56
}

‎features/dd-sdk-android-session-replay-material/src/main/kotlin/com/datadog/android/sessionreplay/material/MaterialExtensionSupport.kt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.cardview.widget.CardView
1010
import com.datadog.android.sessionreplay.ExtensionSupport
1111
import com.datadog.android.sessionreplay.MapperTypeWrapper
1212
import com.datadog.android.sessionreplay.material.internal.CardWireframeMapper
13+
import com.datadog.android.sessionreplay.material.internal.MaterialDrawableToColorMapper
1314
import com.datadog.android.sessionreplay.material.internal.MaterialOptionSelectorDetector
1415
import com.datadog.android.sessionreplay.material.internal.SliderWireframeMapper
1516
import com.datadog.android.sessionreplay.material.internal.TabWireframeMapper
@@ -34,7 +35,9 @@ class MaterialExtensionSupport : ExtensionSupport {
3435
private val viewIdentifierResolver: ViewIdentifierResolver = DefaultViewIdentifierResolver
3536
private val colorStringFormatter: ColorStringFormatter = DefaultColorStringFormatter
3637
private val viewBoundsResolver: ViewBoundsResolver = DefaultViewBoundsResolver
37-
private val drawableToColorMapper: DrawableToColorMapper = DrawableToColorMapper.getDefault()
38+
private val materialDrawableToColorMapper = MaterialDrawableToColorMapper()
39+
private val drawableToColorMapper: DrawableToColorMapper =
40+
DrawableToColorMapper.getDefault(listOf(materialDrawableToColorMapper))
3841

3942
override fun getCustomViewMappers(): List<MapperTypeWrapper<*>> {
4043
val sliderWireframeMapper = SliderWireframeMapper(
@@ -71,4 +74,8 @@ class MaterialExtensionSupport : ExtensionSupport {
7174
override fun getOptionSelectorDetectors(): List<OptionSelectorDetector> {
7275
return listOf(MaterialOptionSelectorDetector())
7376
}
77+
78+
override fun getCustomDrawableMapper(): List<DrawableToColorMapper> {
79+
return listOf(materialDrawableToColorMapper)
80+
}
7481
}

‎features/dd-sdk-android-session-replay-material/src/main/kotlin/com/datadog/android/sessionreplay/material/internal/MaterialDrawableToColorMapper.kt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
3+
* This product includes software developed at Datadog (https://www.datadoghq.com/).
4+
* Copyright 2016-Present Datadog, Inc.
5+
*/
6+
7+
package com.datadog.android.sessionreplay.material.internal
8+
9+
import android.graphics.drawable.Drawable
10+
import com.datadog.android.api.InternalLogger
11+
import com.datadog.android.sessionreplay.utils.DrawableToColorMapper
12+
import com.google.android.material.shape.MaterialShapeDrawable
13+
14+
internal class MaterialDrawableToColorMapper : DrawableToColorMapper {
15+
16+
override fun mapDrawableToColor(drawable: Drawable, internalLogger: InternalLogger): Int? {
17+
return when (drawable) {
18+
is MaterialShapeDrawable -> resolveMaterialShapeDrawable(drawable)
19+
else -> null
20+
}
21+
}
22+
23+
private fun resolveMaterialShapeDrawable(
24+
shapeDrawable: MaterialShapeDrawable
25+
): Int? {
26+
return shapeDrawable.fillColor?.defaultColor
27+
}
28+
}

‎features/dd-sdk-android-session-replay/api/apiSurface‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
interface com.datadog.android.sessionreplay.ExtensionSupport
22
fun getCustomViewMappers(): List<MapperTypeWrapper<*>>
33
fun getOptionSelectorDetectors(): List<com.datadog.android.sessionreplay.recorder.OptionSelectorDetector>
4+
fun getCustomDrawableMapper(): List<com.datadog.android.sessionreplay.utils.DrawableToColorMapper>
45
enum com.datadog.android.sessionreplay.ImagePrivacy : PrivacyLevel
56
- MASK_NONE
67
- MASK_LARGE_ONLY
@@ -81,9 +82,11 @@ interface com.datadog.android.sessionreplay.recorder.mapper.TraverseAllChildrenM
8182
interface com.datadog.android.sessionreplay.recorder.mapper.WireframeMapper<T: android.view.View>
8283
fun map(T, com.datadog.android.sessionreplay.recorder.MappingContext, com.datadog.android.sessionreplay.utils.AsyncJobStatusCallback, com.datadog.android.api.InternalLogger): List<com.datadog.android.sessionreplay.model.MobileSegment.Wireframe>
8384
open class com.datadog.android.sessionreplay.utils.AndroidMDrawableToColorMapper : LegacyDrawableToColorMapper
85+
constructor(List<DrawableToColorMapper> = emptyList())
8486
override fun resolveRippleDrawable(android.graphics.drawable.RippleDrawable, com.datadog.android.api.InternalLogger): Int?
8587
override fun resolveInsetDrawable(android.graphics.drawable.InsetDrawable, com.datadog.android.api.InternalLogger): Int?
8688
open class com.datadog.android.sessionreplay.utils.AndroidQDrawableToColorMapper : AndroidMDrawableToColorMapper
89+
constructor(List<DrawableToColorMapper> = emptyList())
8790
override fun resolveGradientDrawable(android.graphics.drawable.GradientDrawable, com.datadog.android.api.InternalLogger): Int?
8891
companion object
8992
interface com.datadog.android.sessionreplay.utils.AsyncJobStatusCallback
@@ -106,15 +109,17 @@ object com.datadog.android.sessionreplay.utils.DefaultViewIdentifierResolver : V
106109
interface com.datadog.android.sessionreplay.utils.DrawableToColorMapper
107110
fun mapDrawableToColor(android.graphics.drawable.Drawable, com.datadog.android.api.InternalLogger): Int?
108111
companion object
109-
fun getDefault(): DrawableToColorMapper
112+
fun getDefault(List<DrawableToColorMapper> = emptyList()): DrawableToColorMapper
110113
data class com.datadog.android.sessionreplay.utils.GlobalBounds
111114
constructor(Long, Long, Long, Long)
112115
interface com.datadog.android.sessionreplay.utils.ImageWireframeHelper
113116
fun createImageWireframe(android.view.View, com.datadog.android.sessionreplay.ImagePrivacy, Int, Long, Long, Int, Int, Boolean, android.graphics.drawable.Drawable, com.datadog.android.sessionreplay.internal.recorder.resources.DrawableCopier = DefaultDrawableCopier(), AsyncJobStatusCallback, com.datadog.android.sessionreplay.model.MobileSegment.WireframeClip? = null, com.datadog.android.sessionreplay.model.MobileSegment.ShapeStyle? = null, com.datadog.android.sessionreplay.model.MobileSegment.ShapeBorder? = null, String? = DRAWABLE_CHILD_NAME): com.datadog.android.sessionreplay.model.MobileSegment.Wireframe?
114117
fun createCompoundDrawableWireframes(android.widget.TextView, com.datadog.android.sessionreplay.recorder.MappingContext, Int, AsyncJobStatusCallback): MutableList<com.datadog.android.sessionreplay.model.MobileSegment.Wireframe>
115118
companion object
116119
open class com.datadog.android.sessionreplay.utils.LegacyDrawableToColorMapper : DrawableToColorMapper
120+
constructor(List<DrawableToColorMapper> = emptyList())
117121
override fun mapDrawableToColor(android.graphics.drawable.Drawable, com.datadog.android.api.InternalLogger): Int?
122+
protected open fun resolveShapeDrawable(android.graphics.drawable.ShapeDrawable, com.datadog.android.api.InternalLogger): Int
118123
protected open fun resolveColorDrawable(android.graphics.drawable.ColorDrawable): Int?
119124
protected open fun resolveRippleDrawable(android.graphics.drawable.RippleDrawable, com.datadog.android.api.InternalLogger): Int?
120125
protected open fun resolveLayerDrawable(android.graphics.drawable.LayerDrawable, com.datadog.android.api.InternalLogger, (Int, android.graphics.drawable.Drawable) -> Boolean = { _, _ -> true }): Int?

‎features/dd-sdk-android-session-replay/api/dd-sdk-android-session-replay.api‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
public abstract interface class com/datadog/android/sessionreplay/ExtensionSupport {
2+
public abstract fun getCustomDrawableMapper ()Ljava/util/List;
23
public abstract fun getCustomViewMappers ()Ljava/util/List;
34
public abstract fun getOptionSelectorDetectors ()Ljava/util/List;
45
}
@@ -44,8 +45,8 @@ public final class com/datadog/android/sessionreplay/SessionReplay {
4445
}
4546

4647
public final class com/datadog/android/sessionreplay/SessionReplayConfiguration {
47-
public final fun copy (Ljava/lang/String;Lcom/datadog/android/sessionreplay/SessionReplayPrivacy;Ljava/util/List;Ljava/util/List;FLcom/datadog/android/sessionreplay/ImagePrivacy;ZLcom/datadog/android/sessionreplay/TouchPrivacy;Lcom/datadog/android/sessionreplay/TextAndInputPrivacy;ZLcom/datadog/android/sessionreplay/SystemRequirementsConfiguration;)Lcom/datadog/android/sessionreplay/SessionReplayConfiguration;
48-
public static synthetic fun copy$default (Lcom/datadog/android/sessionreplay/SessionReplayConfiguration;Ljava/lang/String;Lcom/datadog/android/sessionreplay/SessionReplayPrivacy;Ljava/util/List;Ljava/util/List;FLcom/datadog/android/sessionreplay/ImagePrivacy;ZLcom/datadog/android/sessionreplay/TouchPrivacy;Lcom/datadog/android/sessionreplay/TextAndInputPrivacy;ZLcom/datadog/android/sessionreplay/SystemRequirementsConfiguration;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/SessionReplayConfiguration;
48+
public final fun copy (Ljava/lang/String;Lcom/datadog/android/sessionreplay/SessionReplayPrivacy;Ljava/util/List;Ljava/util/List;Ljava/util/List;FLcom/datadog/android/sessionreplay/ImagePrivacy;ZLcom/datadog/android/sessionreplay/TouchPrivacy;Lcom/datadog/android/sessionreplay/TextAndInputPrivacy;ZLcom/datadog/android/sessionreplay/SystemRequirementsConfiguration;)Lcom/datadog/android/sessionreplay/SessionReplayConfiguration;
49+
public static synthetic fun copy$default (Lcom/datadog/android/sessionreplay/SessionReplayConfiguration;Ljava/lang/String;Lcom/datadog/android/sessionreplay/SessionReplayPrivacy;Ljava/util/List;Ljava/util/List;Ljava/util/List;FLcom/datadog/android/sessionreplay/ImagePrivacy;ZLcom/datadog/android/sessionreplay/TouchPrivacy;Lcom/datadog/android/sessionreplay/TextAndInputPrivacy;ZLcom/datadog/android/sessionreplay/SystemRequirementsConfiguration;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/SessionReplayConfiguration;
4950
public fun equals (Ljava/lang/Object;)Z
5051
public fun hashCode ()I
5152
public fun toString ()Ljava/lang/String;
@@ -1487,13 +1488,17 @@ public abstract interface class com/datadog/android/sessionreplay/recorder/mappe
14871488

14881489
public class com/datadog/android/sessionreplay/utils/AndroidMDrawableToColorMapper : com/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper {
14891490
public fun <init> ()V
1491+
public fun <init> (Ljava/util/List;)V
1492+
public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
14901493
protected fun resolveInsetDrawable (Landroid/graphics/drawable/InsetDrawable;Lcom/datadog/android/api/InternalLogger;)Ljava/lang/Integer;
14911494
protected fun resolveRippleDrawable (Landroid/graphics/drawable/RippleDrawable;Lcom/datadog/android/api/InternalLogger;)Ljava/lang/Integer;
14921495
}
14931496

14941497
public class com/datadog/android/sessionreplay/utils/AndroidQDrawableToColorMapper : com/datadog/android/sessionreplay/utils/AndroidMDrawableToColorMapper {
14951498
public static final field Companion Lcom/datadog/android/sessionreplay/utils/AndroidQDrawableToColorMapper$Companion;
14961499
public fun <init> ()V
1500+
public fun <init> (Ljava/util/List;)V
1501+
public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
14971502
protected fun resolveGradientDrawable (Landroid/graphics/drawable/GradientDrawable;Lcom/datadog/android/api/InternalLogger;)Ljava/lang/Integer;
14981503
}
14991504

@@ -1539,7 +1544,8 @@ public abstract interface class com/datadog/android/sessionreplay/utils/Drawable
15391544
}
15401545

15411546
public final class com/datadog/android/sessionreplay/utils/DrawableToColorMapper$Companion {
1542-
public final fun getDefault ()Lcom/datadog/android/sessionreplay/utils/DrawableToColorMapper;
1547+
public final fun getDefault (Ljava/util/List;)Lcom/datadog/android/sessionreplay/utils/DrawableToColorMapper;
1548+
public static synthetic fun getDefault$default (Lcom/datadog/android/sessionreplay/utils/DrawableToColorMapper$Companion;Ljava/util/List;ILjava/lang/Object;)Lcom/datadog/android/sessionreplay/utils/DrawableToColorMapper;
15431549
}
15441550

15451551
public final class com/datadog/android/sessionreplay/utils/GlobalBounds {
@@ -1575,6 +1581,8 @@ public final class com/datadog/android/sessionreplay/utils/ImageWireframeHelper$
15751581
public class com/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper : com/datadog/android/sessionreplay/utils/DrawableToColorMapper {
15761582
public static final field Companion Lcom/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper$Companion;
15771583
public fun <init> ()V
1584+
public fun <init> (Ljava/util/List;)V
1585+
public synthetic fun <init> (Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
15781586
public fun mapDrawableToColor (Landroid/graphics/drawable/Drawable;Lcom/datadog/android/api/InternalLogger;)Ljava/lang/Integer;
15791587
protected final fun mergeColorAndAlpha (II)I
15801588
protected fun resolveColorDrawable (Landroid/graphics/drawable/ColorDrawable;)Ljava/lang/Integer;
@@ -1583,6 +1591,7 @@ public class com/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper
15831591
protected fun resolveLayerDrawable (Landroid/graphics/drawable/LayerDrawable;Lcom/datadog/android/api/InternalLogger;Lkotlin/jvm/functions/Function2;)Ljava/lang/Integer;
15841592
public static synthetic fun resolveLayerDrawable$default (Lcom/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper;Landroid/graphics/drawable/LayerDrawable;Lcom/datadog/android/api/InternalLogger;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Ljava/lang/Integer;
15851593
protected fun resolveRippleDrawable (Landroid/graphics/drawable/RippleDrawable;Lcom/datadog/android/api/InternalLogger;)Ljava/lang/Integer;
1594+
protected fun resolveShapeDrawable (Landroid/graphics/drawable/ShapeDrawable;Lcom/datadog/android/api/InternalLogger;)I
15861595
}
15871596

15881597
public final class com/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper$Companion {

0 commit comments

Comments
 (0)