diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json index b1f15ba5ea..f042b504bc 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/consent_granted_sr_test_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 172, - "height": 19, "type": "text", "text": "Welcome to Session Replay", "textStyle": { @@ -46,23 +38,11 @@ } }, { - "width": 88, - "height": 48, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 88, - "height": 48, - "border": { - "color": "#000000ff", - "width": 1 - }, "type": "text", - "text": "Click Me", + "text": "CLICK ME", "textStyle": { "family": "roboto, sans-serif", "size": 14, @@ -72,20 +52,14 @@ "padding": { "top": 14, "bottom": 14, - "left": 11, - "right": 11 + "left": 12, + "right": 12 }, "alignment": { "horizontal": "center", "vertical": "center" } } - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json index cdb27aca70..310498907c 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_allow_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Default CheckBox", "textStyle": { @@ -46,17 +38,10 @@ } }, { - "width": 16, - "height": 16, - "border": { - "color": "#a538afff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat CheckBox", "textStyle": { @@ -78,17 +63,10 @@ } }, { - "width": 16, - "height": 16, - "border": { - "color": "#cc0000ff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "Material CheckBox", "textStyle": { @@ -110,17 +88,10 @@ } }, { - "width": 16, - "height": 16, - "border": { - "color": "#ffbb33ff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "Default Radio", "textStyle": { @@ -142,21 +113,10 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, - "border": { - "color": "#a538afff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Radio", "textStyle": { @@ -178,21 +138,10 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, - "border": { - "color": "#cc0000ff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "Material Radio", "textStyle": { @@ -214,23 +163,8 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, - "border": { - "color": "#ffbb33ff", - "width": 1 - }, - "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "type": "image", + "isEmpty": false } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json index 82a5e31d61..0dd8b3d68b 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxx xxxxxxxx", "textStyle": { @@ -46,8 +38,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#a538afff", "width": 1 @@ -55,8 +45,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxx xxxxxx xxxxxxxx", "textStyle": { @@ -78,8 +66,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#cc0000ff", "width": 1 @@ -87,8 +73,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxxx xxxxxxxx", "textStyle": { @@ -110,8 +94,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#ffbb33ff", "width": 1 @@ -119,8 +101,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxx xxxxx", "textStyle": { @@ -142,12 +122,6 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, "border": { "color": "#a538afff", "width": 1 @@ -155,8 +129,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxx xxxxxx xxxxx", "textStyle": { @@ -178,12 +150,6 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, "border": { "color": "#cc0000ff", "width": 1 @@ -191,8 +157,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxxx xxxxx", "textStyle": { @@ -214,23 +178,11 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, "border": { "color": "#ffbb33ff", "width": 1 }, "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json index cdb27aca70..d9f5e389ea 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_checkbox_and_radio_fields_mask_user_input_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Default CheckBox", "textStyle": { @@ -46,8 +38,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#a538afff", "width": 1 @@ -55,8 +45,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat CheckBox", "textStyle": { @@ -78,8 +66,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#cc0000ff", "width": 1 @@ -87,8 +73,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Material CheckBox", "textStyle": { @@ -110,8 +94,6 @@ } }, { - "width": 16, - "height": 16, "border": { "color": "#ffbb33ff", "width": 1 @@ -119,8 +101,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Default Radio", "textStyle": { @@ -142,12 +122,6 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, "border": { "color": "#a538afff", "width": 1 @@ -155,8 +129,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Radio", "textStyle": { @@ -178,12 +150,6 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, "border": { "color": "#cc0000ff", "width": 1 @@ -191,8 +157,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "Material Radio", "textStyle": { @@ -214,23 +178,11 @@ } }, { - "width": 16, - "height": 16, - "shapeStyle": { - "opacity": 1.0, - "cornerRadius": 10 - }, "border": { "color": "#ffbb33ff", "width": 1 }, "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json index e2b8024ddd..96b2361f56 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_allow_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,29 +14,15 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, @@ -44,20 +30,12 @@ "isEmpty": false }, { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, @@ -65,31 +43,17 @@ "isEmpty": false }, { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, "type": "image", "isEmpty": false - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json index e2b8024ddd..0e80959c89 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,82 +14,37 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, - "type": "shape" - }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false - }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, - "type": "shape" + "type": "placeholder", + "label": "Image" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false - }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#5a595bff", - "opacity": 1.0 - }, - "type": "shape" + "type": "placeholder", + "label": "Image" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false - }, - { - "width": 411, - "height": 56, "type": "placeholder", - "label": "Toolbar" + "label": "Image" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json index 1a46f725db..96b2361f56 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_image_buttons_mask_user_input_payload.json @@ -1,103 +1,60 @@ -[ - { - "type": 4, - "data": { - "width": 411, - "height": 914 - } - }, - { - "type": 6, - "data": { - "has_focus": true - } - }, - { - "type": 10, - "data": { - "wireframes": [ - { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, - "type": "shape" - }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "type": "shape" - }, - { - "width": 80, - "height": 84, - "clip": { - "top": 2, - "bottom": 2, - "left": 0, - "right": 0 - }, - "type": "image", - "mimeType": "image/webp", - "isEmpty": false - }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "type": "shape" - }, - { - "width": 80, - "height": 84, - "clip": { - "top": 2, - "bottom": 2, - "left": 0, - "right": 0 - }, - "type": "image", - "mimeType": "image/webp", - "isEmpty": false +[{ + "type": 4, + "data": { + "width": 320, + "height": 640 + } +}, { + "type": 6, + "data": { + "has_focus": true + } +}, { + "type": 10, + "data": { + "wireframes": [ + { + "type": "shape" + }, + { + "type": "shape" + }, + { + "clip": { + "top": 2, + "bottom": 3, + "left": 0, + "right": 0 }, - { - "width": 80, - "height": 80, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "type": "shape" + "type": "image", + "isEmpty": false + }, + { + "type": "shape" + }, + { + "clip": { + "top": 2, + "bottom": 3, + "left": 0, + "right": 0 }, - { - "width": 80, - "height": 84, - "clip": { - "top": 2, - "bottom": 2, - "left": 0, - "right": 0 - }, - "type": "image", - "mimeType": "image/webp", - "isEmpty": false + "type": "image", + "isEmpty": false + }, + { + "type": "shape" + }, + { + "clip": { + "top": 2, + "bottom": 3, + "left": 0, + "right": 0 }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" - } - ] - } + "type": "image", + "isEmpty": false + } + ] } -] \ No newline at end of file +}] \ No newline at end of file diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json index 8703072656..a0abf13e6f 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_allow_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,20 +14,12 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, @@ -35,22 +27,14 @@ "isEmpty": false }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, "type": "image", "isEmpty": false - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json index 8703072656..20942c44ef 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,43 +14,27 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, - "type": "image", - "isEmpty": false - }, - { - "width": 411, - "height": 56, "type": "placeholder", - "label": "Toolbar" + "label": "Image" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json index 8703072656..a0abf13e6f 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_images_mask_user_input_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,20 +14,12 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, @@ -35,22 +27,14 @@ "isEmpty": false }, { - "width": 80, - "height": 84, "clip": { "top": 2, - "bottom": 2, + "bottom": 3, "left": 0, "right": 0 }, "type": "image", "isEmpty": false - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json index 9d7e8f4be8..889f23977f 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_allow_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,36 +14,26 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -52,27 +42,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -81,27 +67,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -110,27 +92,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -139,27 +117,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -168,27 +142,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -197,39 +167,29 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", "vertical": "center" } } - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json index 9d7e8f4be8..6ef4911d39 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,36 +14,26 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -52,27 +42,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -81,27 +67,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -110,27 +92,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -139,27 +117,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -168,27 +142,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -197,39 +167,29 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", "vertical": "center" } } - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json index 9d7e8f4be8..889f23977f 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_sensitive_fields_mask_user_input_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,36 +14,26 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -52,27 +42,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -81,27 +67,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -110,27 +92,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -139,27 +117,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -168,27 +142,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -197,39 +167,29 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", "vertical": "center" } } - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json index 209b4654df..3aae4f0ca0 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_allow_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "Default Text View", "textStyle": { @@ -46,8 +38,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "Material Text View", "textStyle": { @@ -69,8 +59,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "App Compat Text View", "textStyle": { @@ -92,27 +80,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Edit Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -121,27 +105,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Default Auto Complete Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffbb33ff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -150,27 +130,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Edit Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffbb33ff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -179,27 +155,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Auto Complete Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, - "bottom": 11, - "left": 3, - "right": 3 + "top": 20, + "bottom": 21, + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -208,27 +180,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Material Auto Complete Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -237,8 +205,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "Checked Text View", "textStyle": { @@ -249,7 +215,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -260,17 +226,10 @@ } }, { - "width": 19, - "height": 19, - "border": { - "color": "#ffffffff", - "width": 1 - }, - "type": "shape" + "type": "image", + "isEmpty": false }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Checked Text View", "textStyle": { @@ -281,7 +240,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -292,23 +251,8 @@ } }, { - "width": 19, - "height": 19, - "shapeStyle": { - "backgroundColor": "#ffffffff", - "opacity": 1.0 - }, - "border": { - "color": "#ffffffff", - "width": 1 - }, - "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" + "type": "image", + "isEmpty": false } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json index 61ef0846e6..b84f36d02e 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "xxxxxxx xxxx xxxx", "textStyle": { @@ -46,8 +38,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "xxxxxxxx xxxx xxxx", "textStyle": { @@ -69,8 +59,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "xxx xxxxxx xxxx xxxx", "textStyle": { @@ -92,27 +80,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -121,27 +105,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxxxxxx xxxx xxxxxxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffbb33ff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -150,27 +130,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxx xxxxxx xxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffbb33ff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -179,27 +155,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxx xxxxxx xxxx xxxxxxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, - "bottom": 11, - "left": 3, - "right": 3 + "top": 20, + "bottom": 21, + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -208,27 +180,23 @@ } }, { - "width": 395, - "height": 44, - "type": "image", - "isEmpty": false + "type": "placeholder", + "label": "Image" }, { - "width": 395, - "height": 44, "type": "text", - "text": "***", + "text": "xxxxxxxx xxxx xxxxxxxx xxxx xxxx", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -237,8 +205,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "xxxxxxx xxxx xxxx", "textStyle": { @@ -249,7 +215,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -260,8 +226,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -269,8 +233,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "xxx xxxxxx xxxxxxx xxxx xxxx", "textStyle": { @@ -281,7 +243,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -292,19 +254,11 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 }, "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json index 489126f73f..670843d2d5 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_mask_user_input_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "Default Text View", "textStyle": { @@ -46,8 +38,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "Material Text View", "textStyle": { @@ -69,8 +59,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "App Compat Text View", "textStyle": { @@ -92,27 +80,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Edit Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -121,27 +105,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Default Auto Complete Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffbb33ff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -150,27 +130,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Edit Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffbb33ff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -179,27 +155,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "App Compat Auto Complete Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, - "bottom": 11, - "left": 3, - "right": 3 + "top": 20, + "bottom": 21, + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -208,27 +180,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "Material Auto Complete Text View", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#a538afff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -237,8 +205,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "Checked Text View", "textStyle": { @@ -249,7 +215,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -260,8 +226,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -269,8 +233,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Checked Text View", "textStyle": { @@ -281,7 +243,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -292,19 +254,11 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 }, "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json index d00e932eb4..3826b2da5d 100644 --- a/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json +++ b/instrumented/integration/src/androidTest/assets/session_replay_payloads/sr_text_fields_with_input_mask_user_input_payload.json @@ -1,8 +1,8 @@ [{ "type": 4, "data": { - "width": 411, - "height": 914 + "width": 320, + "height": 640 } }, { "type": 6, @@ -14,17 +14,9 @@ "data": { "wireframes": [ { - "width": 411, - "height": 914, - "shapeStyle": { - "backgroundColor": "#303030ff", - "opacity": 1.0 - }, "type": "shape" }, { - "width": 395, - "height": 19, "type": "text", "text": "Default Text View", "textStyle": { @@ -46,8 +38,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "Material Text View", "textStyle": { @@ -69,8 +59,6 @@ } }, { - "width": 395, - "height": 19, "type": "text", "text": "App Compat Text View", "textStyle": { @@ -92,27 +80,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -121,27 +105,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -150,27 +130,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -179,27 +155,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -208,27 +180,23 @@ } }, { - "width": 395, - "height": 44, "type": "image", "isEmpty": false }, { - "width": 395, - "height": 44, "type": "text", "text": "***", "textStyle": { "family": "roboto, sans-serif", - "size": 17, + "size": 18, "color": "#ffffffff" }, "textPosition": { "padding": { - "top": 9, + "top": 10, "bottom": 11, - "left": 3, - "right": 3 + "left": 4, + "right": 4 }, "alignment": { "horizontal": "left", @@ -237,8 +205,6 @@ } }, { - "width": 395, - "height": 32, "type": "text", "text": "Checked Text View", "textStyle": { @@ -249,7 +215,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -260,8 +226,6 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 @@ -269,8 +233,6 @@ "type": "shape" }, { - "width": 395, - "height": 32, "type": "text", "text": "App Compat Checked Text View", "textStyle": { @@ -281,7 +243,7 @@ "textPosition": { "padding": { "top": 0, - "bottom": 12, + "bottom": 13, "left": 0, "right": 32 }, @@ -292,19 +254,11 @@ } }, { - "width": 19, - "height": 19, "border": { "color": "#ffffffff", "width": 1 }, "type": "shape" - }, - { - "width": 411, - "height": 56, - "type": "placeholder", - "label": "Toolbar" } ] } diff --git a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt index 183313dbc1..b2bd983319 100644 --- a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt +++ b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/BaseSessionReplayTest.kt @@ -13,6 +13,8 @@ import androidx.test.platform.app.InstrumentationRegistry import com.datadog.android.Datadog import com.datadog.android.rum.GlobalRumMonitor import com.datadog.android.sdk.integration.RuntimeConfig +import com.datadog.android.sdk.integration.sessionreplay.BaseSessionReplayTest.MatchingStrategy.CONTAINS +import com.datadog.android.sdk.integration.sessionreplay.BaseSessionReplayTest.MatchingStrategy.EXACT import com.datadog.android.sdk.rules.HandledRequest import com.datadog.android.sdk.rules.SessionReplayTestRule import com.datadog.android.sdk.utils.waitFor @@ -57,7 +59,7 @@ internal abstract class BaseSessionReplayTest { verifyExpectedSrData( rule.getRequests(RuntimeConfig.sessionReplayEndpointUrl), payloadFileName, - MatchingStrategy.CONTAINS + CONTAINS ) true }.doWait(timeoutMs = INITIAL_WAIT_MS) @@ -76,7 +78,7 @@ internal abstract class BaseSessionReplayTest { private fun verifyExpectedSrData( handledRequests: List, expectedPayloadFileName: String, - matchingStrategy: MatchingStrategy = MatchingStrategy.EXACT + matchingStrategy: MatchingStrategy = EXACT ) { val records = handledRequests .mapNotNull { it.extractSrSegmentAsJson()?.asJsonObject } @@ -95,8 +97,8 @@ internal abstract class BaseSessionReplayTest { ).build() ) when (matchingStrategy) { - MatchingStrategy.EXACT -> assertion.containsExactlyElementsOf(expectedPayload) - MatchingStrategy.CONTAINS -> assertion.containsAll(expectedPayload) + EXACT -> assertion.containsExactlyElementsOf(expectedPayload) + CONTAINS -> assertion.containsAll(expectedPayload) } } @@ -255,6 +257,9 @@ internal abstract class BaseSessionReplayTest { wireframeJson.remove("y") wireframeJson.remove("base64") wireframeJson.remove("resourceId") + wireframeJson.remove("width") + wireframeJson.remove("height") + wireframeJson.remove("shapeStyle") wireframeJson }?.fold(JsonArray()) { acc, jsonObject -> acc.add(jsonObject) @@ -294,7 +299,7 @@ internal abstract class BaseSessionReplayTest { } companion object { - internal val INITIAL_WAIT_MS = TimeUnit.SECONDS.toMillis(60) + internal val INITIAL_WAIT_MS = TimeUnit.SECONDS.toMillis(30) private const val UI_THREAD_DELAY_IN_MS = 1000L private const val PAYLOAD_UPDATE_REQUEST = "updateSrPayloads" private val SEGMENT_FORM_DATA_REGEX = diff --git a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt index 6df0531ad7..f833b1351e 100644 --- a/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt +++ b/instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/sessionreplay/ConsentGrantedSrTest.kt @@ -6,9 +6,10 @@ package com.datadog.android.sdk.integration.sessionreplay +import android.os.Build +import androidx.test.filters.SdkSuppress import com.datadog.android.privacy.TrackingConsent import com.datadog.android.sdk.rules.SessionReplayTestRule -import org.junit.Ignore import org.junit.Rule import org.junit.Test @@ -21,8 +22,9 @@ internal class ConsentGrantedSrTest : BaseSessionReplayTest