summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragFullyClose.json510
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragHalfClose.json484
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragOpen.json332
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingClose.json332
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingOpen.json186
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_magneticDetachAndReattach.json424
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealCloseTransition.json232
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealOpenTransition.json198
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragFullyClose.json522
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragHalfClose.json488
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragOpen.json334
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingClose.json338
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingOpen.json202
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_magneticDetachAndReattach.json608
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealCloseTransition.json226
-rw-r--r--packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealOpenTransition.json202
-rw-r--r--packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/reveal/ContentRevealTest.kt12
17 files changed, 2766 insertions, 2864 deletions
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragFullyClose.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragFullyClose.json
index 57f67665242c..5dbb01338090 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragFullyClose.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragFullyClose.json
@@ -59,10 +59,7 @@
896,
912,
928,
- 944,
- 960,
- 976,
- 992
+ 944
],
"features": [
{
@@ -70,256 +67,244 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50.4
+ "x": 5.2,
+ "y": 5.6
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 8.4,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 11.2,
+ "y": 5.2
},
{
- "x": 52.4,
- "y": 50
+ "x": 13.6,
+ "y": 5.2
},
{
- "x": 56,
- "y": 50
+ "x": 15.6,
+ "y": 5.2
},
{
- "x": 58.8,
- "y": 50
+ "x": 16.8,
+ "y": 5.2
},
{
- "x": 60.8,
- "y": 50
+ "x": 17.6,
+ "y": 5.2
},
{
- "x": 62,
- "y": 50
+ "x": 18.4,
+ "y": 5.2
},
{
- "x": 62.8,
- "y": 50
+ "x": 18.8,
+ "y": 5.2
},
{
- "x": 63.6,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
- },
- {
- "x": 64,
- "y": 50
- },
- {
- "x": 64,
- "y": 50
- },
- {
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
}
]
},
@@ -328,255 +313,243 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
- },
- {
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 393.2
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 393.2
+ "width": 150,
+ "height": 293.2
},
{
- "width": 188,
- "height": 386
+ "width": 150,
+ "height": 293.2
},
{
- "width": 188,
- "height": 379.6
+ "width": 150,
+ "height": 286
},
{
- "width": 188,
- "height": 372.8
+ "width": 150,
+ "height": 279.6
},
{
- "width": 188,
- "height": 366.8
+ "width": 150,
+ "height": 273.2
},
{
- "width": 188,
- "height": 360.4
+ "width": 150,
+ "height": 266.8
},
{
- "width": 188,
- "height": 354
+ "width": 150,
+ "height": 260.4
},
{
- "width": 188,
- "height": 347.6
+ "width": 150,
+ "height": 254
},
{
- "width": 188,
- "height": 341.2
+ "width": 150,
+ "height": 247.6
},
{
- "width": 188,
- "height": 341.2
+ "width": 150,
+ "height": 241.2
},
{
- "width": 188,
- "height": 334
+ "width": 150,
+ "height": 241.2
},
{
- "width": 188,
- "height": 328
+ "width": 150,
+ "height": 234.4
},
{
- "width": 188,
- "height": 321.6
+ "width": 150,
+ "height": 228
},
{
- "width": 188,
- "height": 315.2
+ "width": 150,
+ "height": 221.6
},
{
- "width": 188,
- "height": 308.8
+ "width": 150,
+ "height": 215.2
},
{
- "width": 188,
- "height": 302.4
+ "width": 150,
+ "height": 208.8
},
{
- "width": 188,
- "height": 296
+ "width": 150,
+ "height": 202
},
{
- "width": 188,
- "height": 289.6
+ "width": 150,
+ "height": 195.6
},
{
- "width": 188,
- "height": 289.6
+ "width": 150,
+ "height": 189.2
},
{
- "width": 188,
- "height": 282.8
+ "width": 150,
+ "height": 189.2
},
{
- "width": 188,
- "height": 276.4
+ "width": 150,
+ "height": 182.8
},
{
- "width": 188,
- "height": 270
+ "width": 150,
+ "height": 176.4
},
{
- "width": 188,
- "height": 263.6
+ "width": 150,
+ "height": 170
},
{
- "width": 188,
- "height": 257.2
+ "width": 150,
+ "height": 163.6
},
{
- "width": 188,
- "height": 250.8
+ "width": 150,
+ "height": 157.2
},
{
- "width": 188,
- "height": 244.4
+ "width": 150,
+ "height": 150.8
},
{
- "width": 188,
- "height": 238
+ "width": 150,
+ "height": 144.4
},
{
- "width": 188,
- "height": 238
+ "width": 150,
+ "height": 137.6
},
{
- "width": 188,
- "height": 231.2
+ "width": 150,
+ "height": 137.6
},
{
- "width": 188,
- "height": 224.8
+ "width": 150,
+ "height": 131.2
},
{
- "width": 188,
- "height": 218.4
+ "width": 150,
+ "height": 124.8
},
{
- "width": 188,
- "height": 212
+ "width": 150,
+ "height": 118.4
},
{
- "width": 188,
- "height": 212
+ "width": 150,
+ "height": 112
},
{
- "width": 188,
- "height": 192.4
+ "width": 150,
+ "height": 112
},
{
- "width": 188,
- "height": 159.6
+ "width": 150,
+ "height": 99.2
},
{
- "width": 188,
- "height": 124.4
+ "width": 150,
+ "height": 81.2
},
{
- "width": 188,
- "height": 92.8
+ "width": 144,
+ "height": 62.8
},
{
- "width": 183.2,
- "height": 66.4
+ "width": 138,
+ "height": 46.4
},
{
- "width": 176,
- "height": 46
+ "width": 133.2,
+ "height": 32
},
{
- "width": 170.4,
- "height": 28.8
+ "width": 129.6,
+ "height": 20.4
},
{
- "width": 166.8,
- "height": 15.2
+ "width": 127.2,
+ "height": 12
},
{
- "width": 164,
+ "width": 125.2,
"height": 6.4
},
{
- "width": 162.4,
- "height": 0.8
+ "width": 124,
+ "height": 2.8
},
{
- "width": 161.2,
- "height": 0
+ "width": 123.2,
+ "height": 0.4
},
{
- "width": 160.4,
+ "width": 122.4,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
- "height": 0
- },
- {
- "width": 160,
- "height": 0
- },
- {
- "width": 160,
+ "width": 122,
"height": 0
}
]
@@ -627,22 +600,19 @@
1,
1,
1,
- 1,
- 1,
- 0.9808927,
- 0.8211168,
- 0.61845565,
- 0.43834114,
- 0.29850912,
- 0.19755232,
- 0.12793064,
- 0.08142871,
- 0.051099956,
- 0.031684637,
- 0.019442618,
- 0.011821032,
- 0,
- 0,
+ 0.99781144,
+ 0.87040234,
+ 0.6695792,
+ 0.48078007,
+ 0.33033127,
+ 0.22004372,
+ 0.1432175,
+ 0.09153092,
+ 0.057634592,
+ 0.035840213,
+ 0.022048414,
+ 0.013435662,
+ 0.008117795,
0,
0,
0,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragHalfClose.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragHalfClose.json
index 01bc852cf7f4..1543d186ea03 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragHalfClose.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragHalfClose.json
@@ -69,252 +69,252 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50.8,
- "y": 52
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.6,
+ "y": 6.8
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 52.4,
- "y": 50
+ "x": 6.8,
+ "y": 5.2
},
{
- "x": 55.6,
- "y": 50
+ "x": 10.4,
+ "y": 5.2
},
{
- "x": 58.4,
- "y": 50
+ "x": 13.2,
+ "y": 5.2
},
{
- "x": 60.4,
- "y": 50
+ "x": 15.2,
+ "y": 5.2
},
{
- "x": 61.6,
- "y": 50
+ "x": 16.8,
+ "y": 5.2
},
{
- "x": 62.8,
- "y": 50
+ "x": 17.6,
+ "y": 5.2
},
{
- "x": 63.2,
- "y": 50
+ "x": 18.4,
+ "y": 5.2
},
{
- "x": 63.6,
- "y": 50
+ "x": 18.8,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
}
]
},
@@ -323,251 +323,251 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 390
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 390
+ "width": 150,
+ "height": 297.6
},
{
- "width": 188,
- "height": 379.2
+ "width": 150,
+ "height": 294
},
{
- "width": 188,
- "height": 371.2
+ "width": 150,
+ "height": 287.6
},
{
- "width": 188,
- "height": 363.2
+ "width": 150,
+ "height": 282.8
},
{
- "width": 188,
- "height": 355.2
+ "width": 150,
+ "height": 278
},
{
- "width": 188,
- "height": 347.2
+ "width": 150,
+ "height": 273.2
},
{
- "width": 188,
- "height": 339.2
+ "width": 150,
+ "height": 268.4
},
{
- "width": 188,
- "height": 331.2
+ "width": 150,
+ "height": 263.6
},
{
- "width": 188,
- "height": 323.2
+ "width": 150,
+ "height": 258.8
},
{
- "width": 188,
- "height": 323.2
+ "width": 150,
+ "height": 258.8
},
{
- "width": 188,
- "height": 314.8
+ "width": 150,
+ "height": 253.6
},
{
- "width": 188,
- "height": 306.8
+ "width": 150,
+ "height": 248.8
},
{
- "width": 188,
- "height": 298.8
+ "width": 150,
+ "height": 244
},
{
- "width": 188,
- "height": 290.8
+ "width": 150,
+ "height": 239.2
},
{
- "width": 188,
- "height": 282.8
+ "width": 150,
+ "height": 234.4
},
{
- "width": 188,
- "height": 274.8
+ "width": 150,
+ "height": 229.6
},
{
- "width": 188,
- "height": 266.8
+ "width": 150,
+ "height": 224.8
},
{
- "width": 188,
- "height": 258.8
+ "width": 150,
+ "height": 220
},
{
- "width": 188,
- "height": 258.8
+ "width": 150,
+ "height": 220
},
{
- "width": 188,
- "height": 250.4
+ "width": 150,
+ "height": 214.8
},
{
- "width": 188,
- "height": 242.4
+ "width": 150,
+ "height": 210
},
{
- "width": 188,
- "height": 234.4
+ "width": 150,
+ "height": 205.2
},
{
- "width": 188,
- "height": 226.4
+ "width": 150,
+ "height": 200.4
},
{
- "width": 188,
- "height": 218.4
+ "width": 150,
+ "height": 195.6
},
{
- "width": 188,
- "height": 210.4
+ "width": 150,
+ "height": 190.8
},
{
- "width": 188,
- "height": 202.4
+ "width": 150,
+ "height": 186
},
{
- "width": 188,
- "height": 194.4
+ "width": 150,
+ "height": 181.2
},
{
- "width": 188,
- "height": 194.4
+ "width": 150,
+ "height": 181.2
},
{
- "width": 188,
- "height": 185.6
+ "width": 150,
+ "height": 176.4
},
{
- "width": 188,
- "height": 178
+ "width": 150,
+ "height": 171.6
},
{
- "width": 188,
- "height": 170
+ "width": 150,
+ "height": 166.8
},
{
- "width": 188,
+ "width": 150,
"height": 161.6
},
{
- "width": 188,
+ "width": 150,
"height": 161.6
},
{
- "width": 188,
- "height": 144.8
+ "width": 150,
+ "height": 147.2
},
{
- "width": 188,
- "height": 118.8
+ "width": 150,
+ "height": 122
},
{
- "width": 188,
- "height": 92
+ "width": 150,
+ "height": 95.2
},
{
- "width": 183.6,
- "height": 68
+ "width": 146.8,
+ "height": 70.8
},
{
- "width": 176.8,
- "height": 48.4
+ "width": 139.6,
+ "height": 50.8
},
{
- "width": 171.6,
- "height": 32
+ "width": 134,
+ "height": 34
},
{
- "width": 167.6,
- "height": 18
+ "width": 130,
+ "height": 19.2
},
{
- "width": 164.8,
- "height": 8.8
+ "width": 127.2,
+ "height": 9.2
},
{
- "width": 162.8,
+ "width": 125.2,
"height": 2.8
},
{
- "width": 161.6,
+ "width": 123.6,
"height": 0
},
{
- "width": 160.8,
+ "width": 122.8,
"height": 0
},
{
- "width": 160.4,
+ "width": 122.4,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
}
]
@@ -619,19 +619,19 @@
1,
1,
1,
- 0.9967737,
- 0.86538374,
- 0.66414475,
- 0.47619528,
- 0.32686388,
- 0.21757984,
- 0.14153665,
- 0.09041709,
- 0.05691254,
- 0.035380244,
- 0.02175957,
- 0.01325649,
- 0.008007765,
+ 0.99979615,
+ 0.8860379,
+ 0.6869267,
+ 0.4955439,
+ 0.34154767,
+ 0.22803628,
+ 0.14868057,
+ 0.09515619,
+ 0.059987247,
+ 0.037340224,
+ 0.02299112,
+ 0.01402092,
+ 0.008477271,
0,
0,
0,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragOpen.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragOpen.json
index b6e423afc6c4..13f75d2adfb4 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragOpen.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_dragOpen.json
@@ -68,200 +68,200 @@
"type": "not_found"
},
{
- "x": 62.8,
- "y": 50
+ "x": 18,
+ "y": 5.2
},
{
- "x": 62.8,
- "y": 50
+ "x": 18,
+ "y": 5.2
},
{
- "x": 61.6,
- "y": 50
+ "x": 16.8,
+ "y": 5.2
},
{
- "x": 60.8,
- "y": 50
+ "x": 16,
+ "y": 5.2
},
{
- "x": 59.6,
- "y": 50
+ "x": 14.8,
+ "y": 5.2
},
{
- "x": 58.4,
- "y": 50
+ "x": 13.6,
+ "y": 5.2
},
{
- "x": 57.2,
- "y": 50
+ "x": 12.4,
+ "y": 5.2
},
{
- "x": 56,
- "y": 50
+ "x": 11.2,
+ "y": 5.2
},
{
- "x": 55.2,
- "y": 50
+ "x": 10.4,
+ "y": 5.2
},
{
- "x": 54,
- "y": 50
+ "x": 9.2,
+ "y": 5.2
},
{
- "x": 54,
- "y": 50
+ "x": 9.2,
+ "y": 5.2
},
{
- "x": 52.8,
- "y": 50
+ "x": 8,
+ "y": 5.2
},
{
- "x": 51.6,
- "y": 50
+ "x": 6.8,
+ "y": 5.2
},
{
- "x": 50.4,
- "y": 50
+ "x": 5.6,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -279,200 +279,200 @@
"type": "not_found"
},
{
- "width": 162.4,
+ "width": 124.4,
"height": 1.6
},
{
- "width": 162.4,
+ "width": 124.4,
"height": 1.6
},
{
- "width": 164.8,
+ "width": 126.8,
"height": 3.2
},
{
- "width": 166.8,
+ "width": 128.8,
"height": 4.8
},
{
- "width": 169.2,
+ "width": 131.2,
"height": 6.4
},
{
- "width": 171.6,
+ "width": 133.6,
"height": 8
},
{
- "width": 173.6,
+ "width": 135.6,
"height": 9.6
},
{
- "width": 176,
+ "width": 138,
"height": 11.2
},
{
- "width": 178,
+ "width": 140,
"height": 12.8
},
{
- "width": 180.4,
+ "width": 142.4,
"height": 14.4
},
{
- "width": 180.4,
+ "width": 142.4,
"height": 14.4
},
{
- "width": 182.8,
+ "width": 144.8,
"height": 16.4
},
{
- "width": 185.2,
+ "width": 147.2,
"height": 18
},
{
- "width": 187.2,
+ "width": 149.2,
"height": 19.6
},
{
- "width": 188,
+ "width": 150,
"height": 25.6
},
{
- "width": 188,
+ "width": 150,
"height": 36.4
},
{
- "width": 188,
+ "width": 150,
"height": 45.6
},
{
- "width": 188,
+ "width": 150,
"height": 59.2
},
{
- "width": 188,
+ "width": 150,
"height": 72.8
},
{
- "width": 188,
+ "width": 150,
"height": 79.6
},
{
- "width": 188,
+ "width": 150,
"height": 92.8
},
{
- "width": 188,
+ "width": 150,
"height": 104.4
},
{
- "width": 188,
+ "width": 150,
"height": 115.2
},
{
- "width": 188,
+ "width": 150,
"height": 125.2
},
{
- "width": 188,
+ "width": 150,
"height": 134.8
},
{
- "width": 188,
+ "width": 150,
"height": 143.2
},
{
- "width": 188,
+ "width": 150,
"height": 151.2
},
{
- "width": 188,
+ "width": 150,
"height": 158.8
},
{
- "width": 188,
+ "width": 150,
"height": 160
},
{
- "width": 188,
+ "width": 150,
"height": 167.2
},
{
- "width": 188,
+ "width": 150,
"height": 174.4
},
{
- "width": 188,
+ "width": 150,
"height": 180.8
},
{
- "width": 188,
+ "width": 150,
"height": 187.6
},
{
- "width": 188,
+ "width": 150,
"height": 188
},
{
- "width": 188,
- "height": 207.2
+ "width": 150,
+ "height": 200.4
},
{
- "width": 188,
- "height": 240
+ "width": 150,
+ "height": 218.4
},
{
- "width": 188,
- "height": 275.2
+ "width": 150,
+ "height": 236.8
},
{
- "width": 188,
- "height": 306.8
+ "width": 150,
+ "height": 253.2
},
{
- "width": 188,
- "height": 333.2
+ "width": 150,
+ "height": 266.8
},
{
- "width": 188,
- "height": 353.6
+ "width": 150,
+ "height": 277.2
},
{
- "width": 188,
- "height": 368.8
+ "width": 150,
+ "height": 284.8
},
{
- "width": 188,
- "height": 380
+ "width": 150,
+ "height": 290
},
{
- "width": 188,
- "height": 387.6
+ "width": 150,
+ "height": 294
},
{
- "width": 188,
- "height": 392.4
+ "width": 150,
+ "height": 296.4
},
{
- "width": 188,
- "height": 395.6
+ "width": 150,
+ "height": 298
},
{
- "width": 188,
- "height": 398
+ "width": 150,
+ "height": 298.8
},
{
- "width": 188,
- "height": 398.8
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
}
]
},
@@ -494,12 +494,12 @@
0,
0,
0.0067873597,
- 0.0612576,
- 0.19080025,
+ 0.06125766,
+ 0.19080031,
0.39327443,
0.5711931,
- 0.70855826,
- 0.8074064,
+ 0.7085583,
+ 0.8074065,
0.8754226,
0.9207788,
0.95032376,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingClose.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingClose.json
index a82db346ed58..115483cf4013 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingClose.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingClose.json
@@ -40,8 +40,7 @@
592,
608,
624,
- 640,
- 656
+ 640
],
"features": [
{
@@ -49,172 +48,168 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50.4,
- "y": 50.8
+ "x": 5.6,
+ "y": 6.4
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 6.4,
+ "y": 5.2
},
{
- "x": 51.2,
- "y": 50
+ "x": 10.4,
+ "y": 5.2
},
{
- "x": 55.6,
- "y": 50
+ "x": 13.6,
+ "y": 5.2
},
{
- "x": 58.8,
- "y": 50
+ "x": 15.6,
+ "y": 5.2
},
{
- "x": 60.8,
- "y": 50
+ "x": 17.2,
+ "y": 5.2
},
{
- "x": 62,
- "y": 50
+ "x": 18,
+ "y": 5.2
},
{
- "x": 63.2,
- "y": 50
+ "x": 18.8,
+ "y": 5.2
},
{
- "x": 63.6,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
- },
- {
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
}
]
},
@@ -223,171 +218,167 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
- },
- {
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 389.6
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 378.8
+ "width": 150,
+ "height": 290
},
{
- "width": 188,
- "height": 366
+ "width": 150,
+ "height": 278.8
},
{
- "width": 188,
- "height": 352
+ "width": 150,
+ "height": 266
},
{
- "width": 188,
- "height": 352
+ "width": 150,
+ "height": 252
},
{
- "width": 188,
- "height": 316.8
+ "width": 150,
+ "height": 252
},
{
- "width": 188,
- "height": 261.2
+ "width": 150,
+ "height": 223.6
},
{
- "width": 188,
- "height": 202.8
+ "width": 150,
+ "height": 182.8
},
{
- "width": 188,
- "height": 150.8
+ "width": 150,
+ "height": 141.2
},
{
- "width": 188,
- "height": 107.6
+ "width": 150,
+ "height": 104
},
{
- "width": 186,
- "height": 74.4
+ "width": 147.6,
+ "height": 74
},
{
- "width": 177.2,
- "height": 49.6
+ "width": 139.6,
+ "height": 50.8
},
{
- "width": 170.8,
- "height": 29.6
+ "width": 133.6,
+ "height": 32
},
{
- "width": 166.8,
- "height": 12.8
+ "width": 129.2,
+ "height": 15.6
},
{
- "width": 164,
- "height": 2.4
+ "width": 126.4,
+ "height": 5.2
},
{
- "width": 162,
+ "width": 124.4,
"height": 0
},
{
- "width": 160.8,
+ "width": 123.2,
"height": 0
},
{
- "width": 160.4,
+ "width": 122.4,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
}
]
@@ -418,20 +409,19 @@
1,
1,
1,
- 1,
- 0.9833227,
- 0.8263634,
- 0.623688,
- 0.44261706,
- 0.3016883,
- 0.1997872,
- 0.12944388,
- 0.08242595,
- 0.051743627,
- 0.032093227,
- 0.019698441,
- 0.0119793415,
- 0,
+ 0.99479187,
+ 0.8575029,
+ 0.65572864,
+ 0.4691311,
+ 0.3215357,
+ 0.21380007,
+ 0.13896108,
+ 0.0887118,
+ 0.05580789,
+ 0.03467691,
+ 0.021318138,
+ 0.0129826665,
+ 0.007839739,
0,
0,
0,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingOpen.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingOpen.json
index 6dc5a0e79e81..f202fcd5f59c 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingOpen.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_flingOpen.json
@@ -64,104 +64,104 @@
"type": "not_found"
},
{
- "x": 62.4,
- "y": 50
+ "x": 17.6,
+ "y": 5.2
},
{
- "x": 61.2,
- "y": 50
+ "x": 16.4,
+ "y": 5.2
},
{
- "x": 59.2,
- "y": 50
+ "x": 14.4,
+ "y": 5.2
},
{
- "x": 57.2,
- "y": 50
+ "x": 12.4,
+ "y": 5.2
},
{
- "x": 54.8,
- "y": 50
+ "x": 10,
+ "y": 5.2
},
{
- "x": 52.4,
- "y": 50
+ "x": 7.6,
+ "y": 5.2
},
{
- "x": 52.4,
- "y": 50
+ "x": 7.6,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -194,104 +194,104 @@
"type": "not_found"
},
{
- "width": 163.2,
+ "width": 125.2,
"height": 2
},
{
- "width": 166,
+ "width": 128,
"height": 4.4
},
{
- "width": 170,
+ "width": 132,
"height": 6.8
},
{
- "width": 174,
+ "width": 136,
"height": 10
},
{
- "width": 178.4,
+ "width": 140.4,
"height": 13.2
},
{
- "width": 183.6,
+ "width": 145.6,
"height": 16.8
},
{
- "width": 183.6,
+ "width": 145.6,
"height": 16.8
},
{
- "width": 188,
- "height": 44.4
+ "width": 150,
+ "height": 36.8
},
{
- "width": 188,
- "height": 103.6
+ "width": 150,
+ "height": 81.2
},
{
- "width": 188,
- "height": 166
+ "width": 150,
+ "height": 126.8
},
{
- "width": 188,
- "height": 222.4
+ "width": 150,
+ "height": 168
},
{
- "width": 188,
- "height": 270
+ "width": 150,
+ "height": 202.8
},
{
- "width": 188,
- "height": 307.2
+ "width": 150,
+ "height": 230
},
{
- "width": 188,
- "height": 335.6
+ "width": 150,
+ "height": 250.8
},
{
- "width": 188,
- "height": 356.4
+ "width": 150,
+ "height": 266.4
},
{
- "width": 188,
- "height": 371.2
+ "width": 150,
+ "height": 277.6
},
{
- "width": 188,
- "height": 381.6
+ "width": 150,
+ "height": 285.2
},
{
- "width": 188,
- "height": 388.8
+ "width": 150,
+ "height": 290.4
},
{
- "width": 188,
- "height": 393.2
+ "width": 150,
+ "height": 294
},
{
- "width": 188,
- "height": 396
+ "width": 150,
+ "height": 296.4
},
{
- "width": 188,
- "height": 398
+ "width": 150,
+ "height": 298
},
{
- "width": 188,
- "height": 398.8
+ "width": 150,
+ "height": 298.8
},
{
- "width": 188,
- "height": 399.2
+ "width": 150,
+ "height": 299.2
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
}
]
},
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_magneticDetachAndReattach.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_magneticDetachAndReattach.json
index 1cd971aa2898..4c57bda8fd5a 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_magneticDetachAndReattach.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_gesture_magneticDetachAndReattach.json
@@ -89,268 +89,268 @@
"type": "not_found"
},
{
- "x": 62.8,
- "y": 50
+ "x": 18,
+ "y": 5.2
},
{
- "x": 62,
- "y": 50
+ "x": 17.2,
+ "y": 5.2
},
{
- "x": 61.2,
- "y": 50
+ "x": 16.4,
+ "y": 5.2
},
{
- "x": 60.4,
- "y": 50
+ "x": 15.6,
+ "y": 5.2
},
{
- "x": 59.6,
- "y": 50
+ "x": 14.8,
+ "y": 5.2
},
{
- "x": 58.8,
- "y": 50
+ "x": 14,
+ "y": 5.2
},
{
- "x": 58,
- "y": 50
+ "x": 13.2,
+ "y": 5.2
},
{
- "x": 57.2,
- "y": 50
+ "x": 12.4,
+ "y": 5.2
},
{
- "x": 56.4,
- "y": 50
+ "x": 11.6,
+ "y": 5.2
},
{
- "x": 55.6,
- "y": 50
+ "x": 10.8,
+ "y": 5.2
},
{
- "x": 55.2,
- "y": 50
+ "x": 10.4,
+ "y": 5.2
},
{
- "x": 54.4,
- "y": 50
+ "x": 9.6,
+ "y": 5.2
},
{
- "x": 53.6,
- "y": 50
+ "x": 8.8,
+ "y": 5.2
},
{
- "x": 53.2,
- "y": 50
+ "x": 8.4,
+ "y": 5.2
},
{
- "x": 52.8,
- "y": 50
+ "x": 8,
+ "y": 5.2
},
{
- "x": 52,
- "y": 50
+ "x": 7.2,
+ "y": 5.2
},
{
- "x": 51.6,
- "y": 50
+ "x": 6.8,
+ "y": 5.2
},
{
- "x": 51.2,
- "y": 50
+ "x": 6.4,
+ "y": 5.2
},
{
- "x": 50.8,
- "y": 50
+ "x": 6,
+ "y": 5.2
},
{
- "x": 50.4,
- "y": 50
+ "x": 5.6,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50.4,
- "y": 50
+ "x": 5.6,
+ "y": 5.2
},
{
- "x": 50.8,
- "y": 50
+ "x": 6,
+ "y": 5.2
},
{
- "x": 51.2,
- "y": 50
+ "x": 6.4,
+ "y": 5.2
},
{
- "x": 51.6,
- "y": 50
+ "x": 6.8,
+ "y": 5.2
},
{
- "x": 52,
- "y": 50
+ "x": 7.2,
+ "y": 5.2
},
{
- "x": 52.8,
- "y": 50
+ "x": 8,
+ "y": 5.2
},
{
- "x": 53.2,
- "y": 50
+ "x": 8.4,
+ "y": 5.2
},
{
- "x": 53.6,
- "y": 50
+ "x": 8.8,
+ "y": 5.2
},
{
- "x": 54.4,
- "y": 50
+ "x": 9.6,
+ "y": 5.2
},
{
- "x": 55.2,
- "y": 50
+ "x": 10.4,
+ "y": 5.2
},
{
- "x": 55.6,
- "y": 50
+ "x": 10.8,
+ "y": 5.2
},
{
- "x": 56.4,
- "y": 50
+ "x": 11.6,
+ "y": 5.2
},
{
- "x": 57.2,
- "y": 50
+ "x": 12.4,
+ "y": 5.2
},
{
- "x": 58,
- "y": 50
+ "x": 13.2,
+ "y": 5.2
},
{
- "x": 58.8,
- "y": 50
+ "x": 14,
+ "y": 5.2
},
{
- "x": 59.6,
- "y": 50
+ "x": 14.8,
+ "y": 5.2
},
{
- "x": 60.4,
- "y": 50
+ "x": 15.6,
+ "y": 5.2
},
{
- "x": 61.2,
- "y": 50
+ "x": 16.4,
+ "y": 5.2
},
{
- "x": 62,
- "y": 50
+ "x": 17.2,
+ "y": 5.2
},
{
- "x": 62.8,
- "y": 50
+ "x": 18,
+ "y": 5.2
},
{
- "x": 63.6,
- "y": 50
+ "x": 18.8,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
}
]
},
@@ -371,267 +371,267 @@
"type": "not_found"
},
{
- "width": 162.4,
+ "width": 124.4,
"height": 1.6
},
{
- "width": 164,
+ "width": 126,
"height": 2.8
},
{
- "width": 166,
+ "width": 128,
"height": 4
},
{
- "width": 167.6,
+ "width": 129.6,
"height": 5.2
},
{
- "width": 169.2,
+ "width": 131.2,
"height": 6.4
},
{
- "width": 170.8,
+ "width": 132.8,
"height": 7.6
},
{
- "width": 172.4,
+ "width": 134.4,
"height": 8.8
},
{
- "width": 174,
+ "width": 136,
"height": 10
},
{
- "width": 175.2,
+ "width": 137.2,
"height": 10.8
},
{
- "width": 176.8,
+ "width": 138.8,
"height": 12
},
{
- "width": 178,
+ "width": 140,
"height": 12.8
},
{
- "width": 179.2,
+ "width": 141.2,
"height": 13.6
},
{
- "width": 180.8,
+ "width": 142.8,
"height": 14.8
},
{
- "width": 182,
+ "width": 144,
"height": 15.6
},
{
- "width": 182.8,
+ "width": 144.8,
"height": 16.4
},
{
- "width": 184,
+ "width": 146,
"height": 17.2
},
{
- "width": 184.8,
+ "width": 146.8,
"height": 17.6
},
{
- "width": 186,
+ "width": 148,
"height": 18.4
},
{
- "width": 186.8,
+ "width": 148.8,
"height": 19.2
},
{
- "width": 187.6,
+ "width": 149.6,
"height": 19.6
},
{
- "width": 188,
+ "width": 150,
"height": 21.2
},
{
- "width": 188,
+ "width": 150,
"height": 24.8
},
{
- "width": 188,
+ "width": 150,
"height": 30
},
{
- "width": 188,
+ "width": 150,
"height": 38
},
{
- "width": 188,
+ "width": 150,
"height": 46
},
{
- "width": 188,
+ "width": 150,
"height": 54
},
{
- "width": 188,
+ "width": 150,
"height": 61.2
},
{
- "width": 188,
+ "width": 150,
"height": 66.8
},
{
- "width": 188,
+ "width": 150,
"height": 71.6
},
{
- "width": 188,
+ "width": 150,
"height": 75.6
},
{
- "width": 188,
+ "width": 150,
"height": 78
},
{
- "width": 188,
+ "width": 150,
"height": 79.6
},
{
- "width": 188,
+ "width": 150,
"height": 80.8
},
{
- "width": 188,
+ "width": 150,
"height": 80.8
},
{
- "width": 188,
+ "width": 150,
"height": 80.4
},
{
- "width": 188,
+ "width": 150,
"height": 79.6
},
{
- "width": 187.6,
+ "width": 149.6,
"height": 78
},
{
- "width": 186.8,
+ "width": 148.8,
"height": 76.4
},
{
- "width": 186,
+ "width": 148,
"height": 74
},
{
- "width": 184.8,
+ "width": 146.8,
"height": 71.6
},
{
- "width": 184,
+ "width": 146,
"height": 69.2
},
{
- "width": 182.8,
+ "width": 144.8,
"height": 66
},
{
- "width": 182,
+ "width": 144,
"height": 62.8
},
{
- "width": 180.8,
+ "width": 142.8,
"height": 59.2
},
{
- "width": 179.2,
+ "width": 141.2,
"height": 55.6
},
{
- "width": 178,
+ "width": 140,
"height": 52
},
{
- "width": 176.8,
+ "width": 138.8,
"height": 48
},
{
- "width": 175.2,
+ "width": 137.2,
"height": 44
},
{
- "width": 174,
+ "width": 136,
"height": 40
},
{
- "width": 172.4,
+ "width": 134.4,
"height": 37.6
},
{
- "width": 170.8,
+ "width": 132.8,
"height": 38
},
{
- "width": 169.2,
+ "width": 131.2,
"height": 30.4
},
{
- "width": 167.6,
+ "width": 129.6,
"height": 25.2
},
{
- "width": 166,
+ "width": 128,
"height": 20.4
},
{
- "width": 164,
+ "width": 126,
"height": 16
},
{
- "width": 162.4,
+ "width": 124.4,
"height": 12.4
},
{
- "width": 160.8,
+ "width": 122.8,
"height": 9.2
},
{
- "width": 160,
+ "width": 122,
"height": 6.8
},
{
- "width": 160,
+ "width": 122,
"height": 5.2
},
{
- "width": 160,
+ "width": 122,
"height": 3.6
},
{
- "width": 160,
+ "width": 122,
"height": 2.4
},
{
- "width": 160,
+ "width": 122,
"height": 1.6
},
{
- "width": 160,
+ "width": 122,
"height": 0.8
},
{
- "width": 160,
+ "width": 122,
"height": 0.4
},
{
- "width": 160,
+ "width": 122,
"height": 0.4
},
{
- "width": 160,
+ "width": 122,
"height": 0
}
]
@@ -658,10 +658,10 @@
0,
0.012518823,
0.0741024,
- 0.2254293,
+ 0.22542936,
0.42628878,
- 0.5976641,
- 0.7280312,
+ 0.5976642,
+ 0.7280313,
0.82100236,
0.8845844,
0.9267946,
@@ -706,17 +706,17 @@
1,
0.9944124,
0.9417388,
- 0.8184184,
- 0.6157812,
- 0.4361611,
- 0.2968906,
- 0.19641554,
- 0.12716137,
- 0.080921985,
- 0.050773025,
- 0.03147719,
- 0.019312752,
- 0.011740655,
+ 0.81841844,
+ 0.61578125,
+ 0.43616113,
+ 0.29689062,
+ 0.19641556,
+ 0.12716138,
+ 0.080922,
+ 0.050773032,
+ 0.031477194,
+ 0.019312754,
+ 0.011740657,
0
]
}
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealCloseTransition.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealCloseTransition.json
index 1030455e873f..26c80e331f81 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealCloseTransition.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealCloseTransition.json
@@ -28,8 +28,7 @@
400,
416,
432,
- 448,
- 464
+ 448
],
"features": [
{
@@ -37,124 +36,120 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 7.2,
+ "y": 5.2
},
{
- "x": 53.2,
- "y": 50
+ "x": 11.2,
+ "y": 5.2
},
{
- "x": 57.2,
- "y": 50
+ "x": 14,
+ "y": 5.2
},
{
- "x": 59.6,
- "y": 50
+ "x": 16,
+ "y": 5.2
},
{
- "x": 61.6,
- "y": 50
+ "x": 17.6,
+ "y": 5.2
},
{
- "x": 62.8,
- "y": 50
+ "x": 18.4,
+ "y": 5.2
},
{
- "x": 63.6,
- "y": 50
+ "x": 18.8,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 64,
- "y": 50
- },
- {
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
}
]
},
@@ -163,123 +158,119 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 372
+ "width": 150,
+ "height": 278.8
},
{
- "width": 188,
- "height": 312.8
+ "width": 150,
+ "height": 234.8
},
{
- "width": 188,
- "height": 246.8
- },
- {
- "width": 188,
+ "width": 150,
"height": 185.2
},
{
- "width": 188,
- "height": 133.6
+ "width": 150,
+ "height": 138.8
},
{
- "width": 188,
- "height": 93.2
+ "width": 150,
+ "height": 100.4
},
{
- "width": 181.6,
- "height": 62.8
+ "width": 146.4,
+ "height": 69.6
},
{
- "width": 174,
- "height": 40.8
+ "width": 138.4,
+ "height": 46.8
},
{
- "width": 168.8,
- "height": 22.4
+ "width": 132.4,
+ "height": 28
},
{
- "width": 165.2,
- "height": 10
+ "width": 128.4,
+ "height": 13.2
},
{
- "width": 162.8,
- "height": 2.4
+ "width": 125.6,
+ "height": 4
},
{
- "width": 161.2,
+ "width": 124,
"height": 0
},
{
- "width": 160.4,
+ "width": 122.8,
"height": 0
},
{
- "width": 160,
+ "width": 122.4,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 160,
+ "width": 122,
"height": 0
}
]
@@ -298,19 +289,18 @@
1,
1,
1,
- 1,
- 0.91758585,
- 0.72435355,
- 0.52812576,
- 0.3665868,
- 0.24600428,
- 0.16102076,
- 0.103373945,
- 0.06533456,
- 0.04075712,
- 0.025142312,
- 0.015358448,
- 0.0092999935,
+ 0.9762947,
+ 0.8118515,
+ 0.60931784,
+ 0.43090785,
+ 0.29299664,
+ 0.19368339,
+ 0.12531388,
+ 0.079705715,
+ 0.049988627,
+ 0.030979574,
+ 0.019001365,
+ 0.011548042,
0,
0,
0,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealOpenTransition.json b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealOpenTransition.json
index 622c29eebfb4..7a02d369c7f2 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealOpenTransition.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/edge_verticalReveal_triggeredRevealOpenTransition.json
@@ -19,9 +19,7 @@
256,
272,
288,
- 304,
- 320,
- 336
+ 304
],
"features": [
{
@@ -32,88 +30,80 @@
"type": "not_found"
},
{
- "x": 64,
- "y": 50
+ "x": 19.2,
+ "y": 5.2
},
{
- "x": 59.2,
- "y": 50
+ "x": 15.6,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 8,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -125,88 +115,80 @@
"type": "not_found"
},
{
- "width": 160,
+ "width": 122,
"height": 0
},
{
- "width": 169.6,
- "height": 6.8
- },
- {
- "width": 188,
- "height": 26.8
+ "width": 129.2,
+ "height": 5.2
},
{
- "width": 188,
- "height": 95.6
+ "width": 144.4,
+ "height": 16
},
{
- "width": 188,
- "height": 163.2
+ "width": 150,
+ "height": 62
},
{
- "width": 188,
- "height": 222
+ "width": 150,
+ "height": 118.4
},
{
- "width": 188,
- "height": 269.6
+ "width": 150,
+ "height": 166
},
{
- "width": 188,
- "height": 307.2
+ "width": 150,
+ "height": 204
},
{
- "width": 188,
- "height": 335.2
+ "width": 150,
+ "height": 233.2
},
{
- "width": 188,
- "height": 356
+ "width": 150,
+ "height": 254.4
},
{
- "width": 188,
- "height": 370.4
+ "width": 150,
+ "height": 270
},
{
- "width": 188,
- "height": 380.8
+ "width": 150,
+ "height": 280.8
},
{
- "width": 188,
- "height": 387.6
+ "width": 150,
+ "height": 288
},
{
- "width": 188,
- "height": 392.4
+ "width": 150,
+ "height": 292.8
},
{
- "width": 188,
- "height": 395.2
+ "width": 150,
+ "height": 296
},
{
- "width": 188,
- "height": 397.2
+ "width": 150,
+ "height": 298
},
{
- "width": 188,
- "height": 398
+ "width": 150,
+ "height": 298.8
},
{
- "width": 188,
- "height": 398.8
+ "width": 150,
+ "height": 299.2
},
{
- "width": 188,
- "height": 399.2
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 399.2
- },
- {
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
}
]
},
@@ -218,21 +200,19 @@
"type": "not_found"
},
0,
- 0.05698657,
- 0.24197984,
- 0.44158113,
- 0.6097554,
- 0.73685503,
- 0.8271309,
- 0.8886989,
- 0.9294886,
- 0.9559254,
- 0.97276413,
- 0.98333716,
- 0.98989624,
- 1,
- 1,
- 1,
+ 0,
+ 0.0951103,
+ 0.2911651,
+ 0.48551244,
+ 0.6439433,
+ 0.76157355,
+ 0.8441935,
+ 0.9001033,
+ 0.9369305,
+ 0.96069145,
+ 0.97577035,
+ 0.98520935,
+ 0.9910494,
1,
1,
1,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragFullyClose.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragFullyClose.json
index 59e8b51412b8..f44d4cd7c14e 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragFullyClose.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragFullyClose.json
@@ -55,12 +55,7 @@
832,
848,
864,
- 880,
- 896,
- 912,
- 928,
- 944,
- 960
+ 880
],
"features": [
{
@@ -68,248 +63,228 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50.4
+ "x": 5.2,
+ "y": 5.6
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -318,247 +293,227 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
- },
- {
- "width": 188,
- "height": 400
- },
- {
- "width": 188,
- "height": 400
- },
- {
- "width": 188,
- "height": 393.2
- },
- {
- "width": 188,
- "height": 393.2
- },
- {
- "width": 188,
- "height": 386
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 379.6
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 372.8
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 366.8
+ "width": 150,
+ "height": 293.2
},
{
- "width": 188,
- "height": 360.4
+ "width": 150,
+ "height": 293.2
},
{
- "width": 188,
- "height": 354
+ "width": 150,
+ "height": 286
},
{
- "width": 188,
- "height": 347.6
+ "width": 150,
+ "height": 279.6
},
{
- "width": 188,
- "height": 341.2
+ "width": 150,
+ "height": 273.2
},
{
- "width": 188,
- "height": 341.2
+ "width": 150,
+ "height": 266.8
},
{
- "width": 188,
- "height": 334
+ "width": 150,
+ "height": 260.4
},
{
- "width": 188,
- "height": 328
+ "width": 150,
+ "height": 254
},
{
- "width": 188,
- "height": 321.6
+ "width": 150,
+ "height": 247.6
},
{
- "width": 188,
- "height": 315.2
+ "width": 150,
+ "height": 241.2
},
{
- "width": 188,
- "height": 308.8
+ "width": 150,
+ "height": 241.2
},
{
- "width": 188,
- "height": 302.4
+ "width": 150,
+ "height": 234.4
},
{
- "width": 188,
- "height": 296
+ "width": 150,
+ "height": 228
},
{
- "width": 188,
- "height": 289.6
+ "width": 150,
+ "height": 221.6
},
{
- "width": 188,
- "height": 289.6
+ "width": 150,
+ "height": 215.2
},
{
- "width": 188,
- "height": 282.8
+ "width": 150,
+ "height": 208.8
},
{
- "width": 188,
- "height": 276.4
+ "width": 150,
+ "height": 202
},
{
- "width": 188,
- "height": 270
+ "width": 150,
+ "height": 195.6
},
{
- "width": 188,
- "height": 263.6
+ "width": 150,
+ "height": 189.2
},
{
- "width": 188,
- "height": 257.2
+ "width": 150,
+ "height": 189.2
},
{
- "width": 188,
- "height": 250.8
+ "width": 150,
+ "height": 182.8
},
{
- "width": 188,
- "height": 244.4
+ "width": 150,
+ "height": 176.4
},
{
- "width": 188,
- "height": 238
+ "width": 150,
+ "height": 170
},
{
- "width": 188,
- "height": 238
+ "width": 150,
+ "height": 163.6
},
{
- "width": 188,
- "height": 231.2
+ "width": 150,
+ "height": 157.2
},
{
- "width": 188,
- "height": 224.8
+ "width": 150,
+ "height": 150.8
},
{
- "width": 188,
- "height": 218.4
+ "width": 150,
+ "height": 144.4
},
{
- "width": 188,
- "height": 212
+ "width": 150,
+ "height": 137.6
},
{
- "width": 188,
- "height": 212
+ "width": 150,
+ "height": 137.6
},
{
- "width": 188,
- "height": 192.4
+ "width": 150,
+ "height": 131.2
},
{
- "width": 188,
- "height": 159.6
+ "width": 150,
+ "height": 124.8
},
{
- "width": 188,
- "height": 124.4
+ "width": 150,
+ "height": 118.4
},
{
- "width": 188,
- "height": 92.8
+ "width": 150,
+ "height": 112
},
{
- "width": 188,
- "height": 64.8
+ "width": 150,
+ "height": 112
},
{
- "width": 188,
- "height": 44.4
+ "width": 150,
+ "height": 99.2
},
{
- "width": 188,
- "height": 29.2
+ "width": 150,
+ "height": 84.4
},
{
- "width": 188,
- "height": 18.4
+ "width": 150,
+ "height": 70.8
},
{
- "width": 188,
- "height": 10.8
+ "width": 150,
+ "height": 58
},
{
- "width": 188,
- "height": 5.6
+ "width": 150,
+ "height": 46.4
},
{
- "width": 188,
- "height": 2.4
+ "width": 150,
+ "height": 36.4
},
{
- "width": 188,
- "height": 0.4
+ "width": 150,
+ "height": 28
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 20.8
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 15.6
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 11.2
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 8
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 5.6
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 3.6
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 2.4
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 1.2
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 0.8
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 0.4
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
}
]
@@ -609,24 +564,19 @@
1,
1,
1,
- 1,
- 1,
- 0.9808927,
- 0.8211168,
- 0.61845565,
- 0.43834114,
- 0.29850912,
- 0.19755232,
- 0.12793064,
- 0.08142871,
- 0.051099956,
- 0.031684637,
- 0.019442618,
- 0.011821032,
- 0,
- 0,
- 0,
- 0,
+ 0.99781144,
+ 0.87040234,
+ 0.6695792,
+ 0.48078007,
+ 0.33033127,
+ 0.22004372,
+ 0.1432175,
+ 0.09153092,
+ 0.057634592,
+ 0.035840213,
+ 0.022048414,
+ 0.013435662,
+ 0.008117795,
0
]
}
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragHalfClose.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragHalfClose.json
index 210ff0985e78..9b68c71a7a34 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragHalfClose.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragHalfClose.json
@@ -58,7 +58,8 @@
880,
896,
912,
- 928
+ 928,
+ 944
],
"features": [
{
@@ -66,240 +67,244 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50.8,
- "y": 52
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.6,
+ "y": 6.8
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
+ },
+ {
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -308,239 +313,243 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 390
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 390
+ "width": 150,
+ "height": 297.6
},
{
- "width": 188,
- "height": 379.2
+ "width": 150,
+ "height": 294
},
{
- "width": 188,
- "height": 371.2
+ "width": 150,
+ "height": 287.6
},
{
- "width": 188,
- "height": 363.2
+ "width": 150,
+ "height": 282.8
},
{
- "width": 188,
- "height": 355.2
+ "width": 150,
+ "height": 278
},
{
- "width": 188,
- "height": 347.2
+ "width": 150,
+ "height": 273.2
},
{
- "width": 188,
- "height": 339.2
+ "width": 150,
+ "height": 268.4
},
{
- "width": 188,
- "height": 331.2
+ "width": 150,
+ "height": 263.6
},
{
- "width": 188,
- "height": 323.2
+ "width": 150,
+ "height": 258.8
},
{
- "width": 188,
- "height": 323.2
+ "width": 150,
+ "height": 258.8
},
{
- "width": 188,
- "height": 314.8
+ "width": 150,
+ "height": 253.6
},
{
- "width": 188,
- "height": 306.8
+ "width": 150,
+ "height": 248.8
},
{
- "width": 188,
- "height": 298.8
+ "width": 150,
+ "height": 244
},
{
- "width": 188,
- "height": 290.8
+ "width": 150,
+ "height": 239.2
},
{
- "width": 188,
- "height": 282.8
+ "width": 150,
+ "height": 234.4
},
{
- "width": 188,
- "height": 274.8
+ "width": 150,
+ "height": 229.6
},
{
- "width": 188,
- "height": 266.8
+ "width": 150,
+ "height": 224.8
},
{
- "width": 188,
- "height": 258.8
+ "width": 150,
+ "height": 220
},
{
- "width": 188,
- "height": 258.8
+ "width": 150,
+ "height": 220
},
{
- "width": 188,
- "height": 250.4
+ "width": 150,
+ "height": 214.8
},
{
- "width": 188,
- "height": 242.4
+ "width": 150,
+ "height": 210
},
{
- "width": 188,
- "height": 234.4
+ "width": 150,
+ "height": 205.2
},
{
- "width": 188,
- "height": 226.4
+ "width": 150,
+ "height": 200.4
},
{
- "width": 188,
- "height": 218.4
+ "width": 150,
+ "height": 195.6
},
{
- "width": 188,
- "height": 210.4
+ "width": 150,
+ "height": 190.8
},
{
- "width": 188,
- "height": 202.4
+ "width": 150,
+ "height": 186
},
{
- "width": 188,
- "height": 194.4
+ "width": 150,
+ "height": 181.2
},
{
- "width": 188,
- "height": 194.4
+ "width": 150,
+ "height": 181.2
},
{
- "width": 188,
- "height": 185.6
+ "width": 150,
+ "height": 176.4
},
{
- "width": 188,
- "height": 178
+ "width": 150,
+ "height": 171.6
},
{
- "width": 188,
- "height": 170
+ "width": 150,
+ "height": 166.8
},
{
- "width": 188,
+ "width": 150,
"height": 161.6
},
{
- "width": 188,
+ "width": 150,
"height": 161.6
},
{
- "width": 188,
- "height": 144.8
+ "width": 150,
+ "height": 147.2
},
{
- "width": 188,
- "height": 118.8
+ "width": 150,
+ "height": 122
},
{
- "width": 188,
- "height": 92
+ "width": 150,
+ "height": 95.2
},
{
- "width": 188,
- "height": 68
+ "width": 150,
+ "height": 70.8
},
{
- "width": 188,
- "height": 49.6
+ "width": 150,
+ "height": 51.6
},
{
- "width": 188,
- "height": 35.2
+ "width": 150,
+ "height": 36.8
},
{
- "width": 188,
- "height": 24.4
+ "width": 150,
+ "height": 25.6
},
{
- "width": 188,
- "height": 16.4
+ "width": 150,
+ "height": 17.2
},
{
- "width": 188,
- "height": 10.4
+ "width": 150,
+ "height": 11.2
},
{
- "width": 188,
- "height": 6.4
+ "width": 150,
+ "height": 6.8
},
{
- "width": 188,
- "height": 3.6
+ "width": 150,
+ "height": 4
},
{
- "width": 188,
- "height": 1.6
+ "width": 150,
+ "height": 2
},
{
- "width": 188,
- "height": 0.4
+ "width": 150,
+ "height": 0.8
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
+ "height": 0
+ },
+ {
+ "width": 150,
"height": 0
}
]
@@ -592,19 +601,20 @@
1,
1,
1,
- 0.9967737,
- 0.86538374,
- 0.66414475,
- 0.47619528,
- 0.32686388,
- 0.21757984,
- 0.14153665,
- 0.09041709,
- 0.05691254,
- 0.035380244,
- 0.02175957,
- 0.01325649,
- 0.008007765,
+ 0.99979615,
+ 0.8860379,
+ 0.6869267,
+ 0.4955439,
+ 0.34154767,
+ 0.22803628,
+ 0.14868057,
+ 0.09515619,
+ 0.059987247,
+ 0.037340224,
+ 0.02299112,
+ 0.01402092,
+ 0.008477271,
+ 0,
0,
0,
0
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragOpen.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragOpen.json
index d186df22dda0..1bf6a62d02af 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragOpen.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_dragOpen.json
@@ -68,200 +68,200 @@
"type": "not_found"
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -279,200 +279,200 @@
"type": "not_found"
},
{
- "width": 188,
+ "width": 150,
"height": 1.6
},
{
- "width": 188,
+ "width": 150,
"height": 1.6
},
{
- "width": 188,
+ "width": 150,
"height": 3.2
},
{
- "width": 188,
+ "width": 150,
"height": 4.8
},
{
- "width": 188,
+ "width": 150,
"height": 6.4
},
{
- "width": 188,
+ "width": 150,
"height": 8
},
{
- "width": 188,
+ "width": 150,
"height": 9.6
},
{
- "width": 188,
+ "width": 150,
"height": 11.2
},
{
- "width": 188,
+ "width": 150,
"height": 12.8
},
{
- "width": 188,
+ "width": 150,
"height": 14.4
},
{
- "width": 188,
+ "width": 150,
"height": 14.4
},
{
- "width": 188,
+ "width": 150,
"height": 16.4
},
{
- "width": 188,
+ "width": 150,
"height": 18
},
{
- "width": 188,
+ "width": 150,
"height": 19.6
},
{
- "width": 188,
- "height": 21.2
+ "width": 150,
+ "height": 20.8
},
{
- "width": 188,
+ "width": 150,
"height": 22.8
},
{
- "width": 188,
+ "width": 150,
"height": 24.4
},
{
- "width": 188,
+ "width": 150,
"height": 26
},
{
- "width": 188,
+ "width": 150,
"height": 27.6
},
{
- "width": 188,
+ "width": 150,
"height": 27.6
},
{
- "width": 188,
+ "width": 150,
"height": 29.2
},
{
- "width": 188,
+ "width": 150,
"height": 30.8
},
{
- "width": 188,
+ "width": 150,
"height": 32.4
},
{
- "width": 188,
+ "width": 150,
"height": 34
},
{
- "width": 188,
+ "width": 150,
"height": 40.4
},
{
- "width": 188,
+ "width": 150,
"height": 52.4
},
{
- "width": 188,
+ "width": 150,
"height": 64.8
},
{
- "width": 188,
+ "width": 150,
"height": 83.2
},
{
- "width": 188,
+ "width": 150,
"height": 96
},
{
- "width": 188,
+ "width": 150,
"height": 114.8
},
{
- "width": 188,
+ "width": 150,
"height": 132
},
{
- "width": 188,
+ "width": 150,
"height": 148
},
{
- "width": 188,
+ "width": 150,
"height": 162
},
{
- "width": 188,
+ "width": 150,
"height": 168.4
},
{
- "width": 188,
- "height": 192.8
+ "width": 150,
+ "height": 186
},
{
- "width": 188,
- "height": 229.6
+ "width": 150,
+ "height": 208
},
{
- "width": 188,
- "height": 268
+ "width": 150,
+ "height": 229.6
},
{
- "width": 188,
- "height": 302
+ "width": 150,
+ "height": 248.4
},
{
- "width": 188,
- "height": 330
+ "width": 150,
+ "height": 263.2
},
{
- "width": 188,
- "height": 351.6
+ "width": 150,
+ "height": 274.8
},
{
- "width": 188,
- "height": 367.6
+ "width": 150,
+ "height": 283.2
},
{
- "width": 188,
- "height": 379.2
+ "width": 150,
+ "height": 289.2
},
{
- "width": 188,
- "height": 387.2
+ "width": 150,
+ "height": 293.6
},
{
- "width": 188,
- "height": 392.4
+ "width": 150,
+ "height": 296
},
{
- "width": 188,
- "height": 395.6
+ "width": 150,
+ "height": 298
},
{
- "width": 188,
- "height": 398
+ "width": 150,
+ "height": 298.8
},
{
- "width": 188,
- "height": 398.8
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
}
]
},
@@ -494,12 +494,12 @@
0,
0,
0.0067873597,
- 0.0612576,
- 0.19080025,
+ 0.06125766,
+ 0.19080031,
0.39327443,
0.5711931,
- 0.70855826,
- 0.8074064,
+ 0.7085583,
+ 0.8074065,
0.8754226,
0.9207788,
0.95032376,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingClose.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingClose.json
index a9c24fa87089..86805bd6ff29 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingClose.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingClose.json
@@ -39,9 +39,7 @@
576,
592,
608,
- 624,
- 640,
- 656
+ 624
],
"features": [
{
@@ -49,172 +47,164 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50.4,
- "y": 50.8
+ "x": 5.6,
+ "y": 6.4
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -223,171 +213,163 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 389.6
+ "width": 150,
+ "height": 290
},
{
- "width": 188,
- "height": 378.8
+ "width": 150,
+ "height": 278.8
},
{
- "width": 188,
- "height": 366
+ "width": 150,
+ "height": 266
},
{
- "width": 188,
- "height": 352
+ "width": 150,
+ "height": 252
},
{
- "width": 188,
- "height": 352
+ "width": 150,
+ "height": 252
},
{
- "width": 188,
- "height": 316.8
+ "width": 150,
+ "height": 223.6
},
{
- "width": 188,
- "height": 261.2
+ "width": 150,
+ "height": 182.8
},
{
- "width": 188,
- "height": 202.8
+ "width": 150,
+ "height": 141.2
},
{
- "width": 188,
- "height": 150.8
+ "width": 150,
+ "height": 104
},
{
- "width": 188,
- "height": 107.6
+ "width": 150,
+ "height": 72
},
{
- "width": 188,
- "height": 71.2
+ "width": 150,
+ "height": 46
},
{
- "width": 188,
- "height": 41.6
+ "width": 150,
+ "height": 28
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 15.6
},
{
- "width": 188,
- "height": 8.4
+ "width": 150,
+ "height": 7.2
},
{
- "width": 188,
- "height": 0.4
- },
- {
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 2
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
- "height": 0
- },
- {
- "width": 188,
+ "width": 150,
"height": 0
}
]
@@ -418,21 +400,19 @@
1,
1,
1,
- 1,
- 0.9833227,
- 0.8263634,
- 0.623688,
- 0.44261706,
- 0.3016883,
- 0.1997872,
- 0.12944388,
- 0.08242595,
- 0.051743627,
- 0.032093227,
- 0.019698441,
- 0.0119793415,
- 0,
- 0,
+ 0.99479187,
+ 0.8575029,
+ 0.65572864,
+ 0.4691311,
+ 0.3215357,
+ 0.21380007,
+ 0.13896108,
+ 0.0887118,
+ 0.05580789,
+ 0.03467691,
+ 0.021318138,
+ 0.0129826665,
+ 0.007839739,
0,
0,
0,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingOpen.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingOpen.json
index f9279f1fae5c..98519db9e848 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingOpen.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_flingOpen.json
@@ -66,112 +66,112 @@
"type": "not_found"
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -204,112 +204,112 @@
"type": "not_found"
},
{
- "width": 188,
+ "width": 150,
"height": 2
},
{
- "width": 188,
+ "width": 150,
"height": 4.4
},
{
- "width": 188,
+ "width": 150,
"height": 6.8
},
{
- "width": 188,
+ "width": 150,
"height": 10
},
{
- "width": 188,
+ "width": 150,
"height": 13.2
},
{
- "width": 188,
+ "width": 150,
"height": 16.8
},
{
- "width": 188,
+ "width": 150,
"height": 16.8
},
{
- "width": 188,
- "height": 25.2
+ "width": 150,
+ "height": 23.6
},
{
- "width": 188,
- "height": 53.2
+ "width": 150,
+ "height": 32.8
},
{
- "width": 188,
- "height": 119.6
+ "width": 150,
+ "height": 76.8
},
{
- "width": 188,
- "height": 182
+ "width": 150,
+ "height": 123.6
},
{
- "width": 188,
- "height": 235.6
+ "width": 150,
+ "height": 164.8
},
{
- "width": 188,
- "height": 279.2
+ "width": 150,
+ "height": 198.4
},
{
- "width": 188,
- "height": 313.2
+ "width": 150,
+ "height": 225.6
},
{
- "width": 188,
- "height": 338.8
+ "width": 150,
+ "height": 246.4
},
{
- "width": 188,
- "height": 357.6
+ "width": 150,
+ "height": 262
},
{
- "width": 188,
- "height": 371.2
+ "width": 150,
+ "height": 273.2
},
{
- "width": 188,
- "height": 380.8
+ "width": 150,
+ "height": 281.6
},
{
- "width": 188,
- "height": 387.6
+ "width": 150,
+ "height": 287.6
},
{
- "width": 188,
- "height": 392
+ "width": 150,
+ "height": 292
},
{
- "width": 188,
- "height": 395.2
+ "width": 150,
+ "height": 294.8
},
{
- "width": 188,
- "height": 396.8
+ "width": 150,
+ "height": 296.4
},
{
- "width": 188,
- "height": 398
+ "width": 150,
+ "height": 297.6
},
{
- "width": 188,
- "height": 398.8
+ "width": 150,
+ "height": 298.4
},
{
- "width": 188,
- "height": 399.2
+ "width": 150,
+ "height": 299.2
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
}
]
},
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_magneticDetachAndReattach.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_magneticDetachAndReattach.json
index 2504e57a927b..850cee9130d0 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_magneticDetachAndReattach.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_gesture_magneticDetachAndReattach.json
@@ -68,7 +68,10 @@
1040,
1056,
1072,
- 1088
+ 1088,
+ 1104,
+ 1120,
+ 1136
],
"features": [
{
@@ -85,267 +88,280 @@
"type": "not_found"
},
{
- "type": "not_found"
+ "x": 5.2,
+ "y": 5.2
+ },
+ {
+ "x": 5.2,
+ "y": 5.2
+ },
+ {
+ "x": 5.2,
+ "y": 5.2
+ },
+ {
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -363,266 +379,279 @@
"type": "not_found"
},
{
- "type": "not_found"
+ "width": 150,
+ "height": 2.8
},
{
- "width": 188,
- "height": 1.6
+ "width": 150,
+ "height": 4.8
},
{
- "width": 188,
- "height": 2.8
+ "width": 150,
+ "height": 6.8
},
{
- "width": 188,
- "height": 4
+ "width": 150,
+ "height": 8.4
},
{
- "width": 188,
- "height": 5.2
+ "width": 150,
+ "height": 10.4
},
{
- "width": 188,
- "height": 6.4
+ "width": 150,
+ "height": 12.4
},
{
- "width": 188,
- "height": 7.6
+ "width": 150,
+ "height": 14
},
{
- "width": 188,
- "height": 8.8
+ "width": 150,
+ "height": 16
},
{
- "width": 188,
- "height": 10
+ "width": 150,
+ "height": 17.6
},
{
- "width": 188,
- "height": 10.8
+ "width": 150,
+ "height": 19.2
},
{
- "width": 188,
- "height": 12
+ "width": 150,
+ "height": 20.8
},
{
- "width": 188,
- "height": 12.8
+ "width": 150,
+ "height": 22.4
},
{
- "width": 188,
- "height": 13.6
+ "width": 150,
+ "height": 24
},
{
- "width": 188,
- "height": 14.8
+ "width": 150,
+ "height": 25.6
},
{
- "width": 188,
- "height": 15.6
+ "width": 150,
+ "height": 26.8
},
{
- "width": 188,
- "height": 16.4
+ "width": 150,
+ "height": 28
},
{
- "width": 188,
- "height": 17.2
+ "width": 150,
+ "height": 29.2
},
{
- "width": 188,
- "height": 17.6
+ "width": 150,
+ "height": 30.4
},
{
- "width": 188,
- "height": 18.4
+ "width": 150,
+ "height": 31.6
},
{
- "width": 188,
- "height": 19.2
+ "width": 150,
+ "height": 32.4
},
{
- "width": 188,
- "height": 19.6
+ "width": 150,
+ "height": 33.2
},
{
- "width": 188,
- "height": 20
+ "width": 150,
+ "height": 34
},
{
- "width": 188,
- "height": 20.4
+ "width": 150,
+ "height": 36.8
},
{
- "width": 188,
- "height": 20.8
+ "width": 150,
+ "height": 42.4
},
{
- "width": 188,
- "height": 21.2
+ "width": 150,
+ "height": 50.8
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 64
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 78
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 91.2
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 102.4
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 112.4
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 120
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 126
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 130
},
{
- "width": 188,
- "height": 21.2
+ "width": 150,
+ "height": 132.8
},
{
- "width": 188,
- "height": 20.8
+ "width": 150,
+ "height": 134
},
{
- "width": 188,
- "height": 20.4
+ "width": 150,
+ "height": 134
},
{
- "width": 188,
- "height": 20
+ "width": 150,
+ "height": 133.2
},
{
- "width": 188,
- "height": 19.6
+ "width": 150,
+ "height": 131.2
},
{
- "width": 188,
- "height": 19.2
+ "width": 150,
+ "height": 128.8
},
{
- "width": 188,
- "height": 18.4
+ "width": 150,
+ "height": 125.2
},
{
- "width": 188,
- "height": 17.6
+ "width": 150,
+ "height": 121.6
},
{
- "width": 188,
- "height": 17.2
+ "width": 150,
+ "height": 117.6
},
{
- "width": 188,
- "height": 16.4
+ "width": 150,
+ "height": 112.8
},
{
- "width": 188,
- "height": 15.6
+ "width": 150,
+ "height": 108
},
{
- "width": 188,
- "height": 14.8
+ "width": 150,
+ "height": 102.4
},
{
- "width": 188,
- "height": 13.6
+ "width": 150,
+ "height": 96.4
},
{
- "width": 188,
- "height": 12.8
+ "width": 150,
+ "height": 91.2
},
{
- "width": 188,
- "height": 12
+ "width": 150,
+ "height": 88
},
{
- "width": 188,
- "height": 10.8
+ "width": 150,
+ "height": 81.6
},
{
- "width": 188,
- "height": 10
+ "width": 150,
+ "height": 70.8
},
{
- "width": 188,
- "height": 8.8
+ "width": 150,
+ "height": 59.2
},
{
- "width": 188,
- "height": 7.6
+ "width": 150,
+ "height": 48
},
{
- "width": 188,
- "height": 6.4
+ "width": 150,
+ "height": 38.4
},
{
- "width": 188,
- "height": 5.2
+ "width": 150,
+ "height": 30
},
{
- "width": 188,
- "height": 4
+ "width": 150,
+ "height": 22.8
},
{
- "width": 188,
- "height": 2.8
+ "width": 150,
+ "height": 17.2
},
{
- "width": 188,
- "height": 1.6
+ "width": 150,
+ "height": 12.4
},
{
- "width": 188,
- "height": 0.4
+ "width": 150,
+ "height": 9.2
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 6.4
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 4.4
},
{
- "width": 188,
- "height": 0
+ "width": 150,
+ "height": 2.8
+ },
+ {
+ "width": 150,
+ "height": 1.6
+ },
+ {
+ "width": 150,
+ "height": 1.2
+ },
+ {
+ "width": 150,
+ "height": 0.4
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
}
]
@@ -640,26 +669,27 @@
{
"type": "not_found"
},
- {
- "type": "not_found"
- },
- 0,
- 0,
0,
0,
- 0.012518823,
- 0.0741024,
- 0.2254293,
- 0.42628878,
- 0.5976641,
- 0.7280312,
- 0.82100236,
- 0.8845844,
- 0.9267946,
- 0.95419544,
- 0.9716705,
- 0.98265487,
- 0.98947525,
+ 0.0066464543,
+ 0.059778452,
+ 0.1875459,
+ 0.39009166,
+ 0.5686131,
+ 0.70664865,
+ 0.8060679,
+ 0.87451804,
+ 0.92018366,
+ 0.94994,
+ 0.9689752,
+ 0.9809703,
+ 0.98843443,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
1,
1,
1,
@@ -695,19 +725,19 @@
1,
1,
1,
- 0.9944124,
- 0.9417388,
- 0.8184184,
- 0.6157812,
- 0.4361611,
- 0.2968906,
- 0.19641554,
- 0.12716137,
- 0.080921985,
- 0.050773025,
- 0.03147719,
- 0.019312752,
- 0.011740655
+ 0.98828065,
+ 0.9288363,
+ 0.7806658,
+ 0.57941735,
+ 0.40687433,
+ 0.27529213,
+ 0.18131107,
+ 0.11697123,
+ 0.074225225,
+ 0.046460062,
+ 0.028744182,
+ 0.017604083,
+ 0.010684598
]
}
]
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealCloseTransition.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealCloseTransition.json
index 86fac739372e..afa005ac421e 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealCloseTransition.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealCloseTransition.json
@@ -27,8 +27,7 @@
384,
400,
416,
- 432,
- 448
+ 432
],
"features": [
{
@@ -36,120 +35,116 @@
"type": "dpOffset",
"data_points": [
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
- },
- {
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -158,119 +153,115 @@
"type": "dpSize",
"data_points": [
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 400
+ "width": 150,
+ "height": 300
},
{
- "width": 188,
- "height": 372
+ "width": 150,
+ "height": 278.8
},
{
- "width": 188,
- "height": 312.8
+ "width": 150,
+ "height": 234.8
},
{
- "width": 188,
- "height": 246.8
- },
- {
- "width": 188,
+ "width": 150,
"height": 185.2
},
{
- "width": 188,
- "height": 133.6
+ "width": 150,
+ "height": 138.8
},
{
- "width": 188,
- "height": 93.2
+ "width": 150,
+ "height": 100.4
},
{
- "width": 188,
- "height": 58.8
+ "width": 150,
+ "height": 66.8
},
{
- "width": 188,
- "height": 34.4
+ "width": 150,
+ "height": 41.6
},
{
- "width": 188,
- "height": 18
+ "width": 150,
+ "height": 23.6
},
{
- "width": 188,
- "height": 7.6
+ "width": 150,
+ "height": 12
},
{
- "width": 188,
- "height": 0.8
+ "width": 150,
+ "height": 4.4
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
+ "width": 150,
"height": 0
}
]
@@ -289,19 +280,18 @@
1,
1,
1,
- 1,
- 0.91758585,
- 0.72435355,
- 0.52812576,
- 0.3665868,
- 0.24600428,
- 0.16102076,
- 0.103373945,
- 0.06533456,
- 0.04075712,
- 0.025142312,
- 0.015358448,
- 0.0092999935,
+ 0.9762947,
+ 0.8118515,
+ 0.60931784,
+ 0.43090785,
+ 0.29299664,
+ 0.19368339,
+ 0.12531388,
+ 0.079705715,
+ 0.049988627,
+ 0.030979574,
+ 0.019001365,
+ 0.011548042,
0,
0,
0,
diff --git a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealOpenTransition.json b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealOpenTransition.json
index ad282f216f8f..317d4804fa52 100644
--- a/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealOpenTransition.json
+++ b/packages/SystemUI/compose/scene/tests/goldens/floating_verticalReveal_triggeredRevealOpenTransition.json
@@ -21,7 +21,8 @@
288,
304,
320,
- 336
+ 336,
+ 352
],
"features": [
{
@@ -32,88 +33,92 @@
"type": "not_found"
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
},
{
- "x": 50,
- "y": 50
+ "x": 5.2,
+ "y": 5.2
+ },
+ {
+ "x": 5.2,
+ "y": 5.2
}
]
},
@@ -125,88 +130,92 @@
"type": "not_found"
},
{
- "width": 188,
+ "width": 150,
"height": 0
},
{
- "width": 188,
- "height": 6.8
+ "width": 150,
+ "height": 5.2
},
{
- "width": 188,
- "height": 21.6
+ "width": 150,
+ "height": 16
},
{
- "width": 188,
- "height": 52.8
+ "width": 150,
+ "height": 28.4
},
{
- "width": 188,
- "height": 129.6
+ "width": 150,
+ "height": 63.6
},
{
- "width": 188,
- "height": 196.4
+ "width": 150,
+ "height": 116.4
},
{
- "width": 188,
- "height": 250.4
+ "width": 150,
+ "height": 161.2
},
{
- "width": 188,
- "height": 293.2
+ "width": 150,
+ "height": 197.2
},
{
- "width": 188,
- "height": 325.2
+ "width": 150,
+ "height": 225.2
},
{
- "width": 188,
- "height": 348.8
+ "width": 150,
+ "height": 246.8
},
{
- "width": 188,
- "height": 365.6
+ "width": 150,
+ "height": 262.4
},
{
- "width": 188,
- "height": 377.2
+ "width": 150,
+ "height": 274
},
{
- "width": 188,
- "height": 385.6
+ "width": 150,
+ "height": 282.4
},
{
- "width": 188,
- "height": 391.2
+ "width": 150,
+ "height": 288.4
},
{
- "width": 188,
- "height": 394.8
+ "width": 150,
+ "height": 292.4
},
{
- "width": 188,
- "height": 396.8
+ "width": 150,
+ "height": 294.8
},
{
- "width": 188,
- "height": 398
+ "width": 150,
+ "height": 296.4
},
{
- "width": 188,
- "height": 398.8
+ "width": 150,
+ "height": 297.6
},
{
- "width": 188,
- "height": 399.2
+ "width": 150,
+ "height": 298.4
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.2
},
{
- "width": 188,
- "height": 399.6
+ "width": 150,
+ "height": 299.6
+ },
+ {
+ "width": 150,
+ "height": 299.6
}
]
},
@@ -218,18 +227,19 @@
"type": "not_found"
},
0,
- 0.05698657,
- 0.24197984,
- 0.44158113,
- 0.6097554,
- 0.73685503,
- 0.8271309,
- 0.8886989,
- 0.9294886,
- 0.9559254,
- 0.97276413,
- 0.98333716,
- 0.98989624,
+ 0,
+ 0.0951103,
+ 0.2911651,
+ 0.48551244,
+ 0.6439433,
+ 0.76157355,
+ 0.8441935,
+ 0.9001033,
+ 0.9369305,
+ 0.96069145,
+ 0.97577035,
+ 0.98520935,
+ 0.9910494,
1,
1,
1,
diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/reveal/ContentRevealTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/reveal/ContentRevealTest.kt
index ed73d100dc6b..1bc83e0401bf 100644
--- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/reveal/ContentRevealTest.kt
+++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/reveal/ContentRevealTest.kt
@@ -111,10 +111,12 @@ class ContentRevealTest(private val isFloating: Boolean) {
assertVerticalContainerRevealMotion(
GestureRevealMotion(SceneClosed) {
val gestureDurationMillis = 1000L
+ // detach position for the floating container is larger
+ val gestureHeight = if (isFloating) 160.dp.toPx() else 100.dp.toPx()
swipe(
curve = {
val progress = it / gestureDurationMillis.toFloat()
- val y = sin(progress * Math.PI).toFloat() * 100.dp.toPx()
+ val y = sin(progress * Math.PI).toFloat() * gestureHeight
Offset(centerX, y)
},
gestureDurationMillis,
@@ -159,7 +161,7 @@ class ContentRevealTest(private val isFloating: Boolean) {
fun verticalReveal_gesture_dragHalfClose() {
assertVerticalContainerRevealMotion(
GestureRevealMotion(SceneOpen) {
- swipeUp(350.dp.toPx(), 100.dp.toPx(), durationMillis = 500)
+ swipeUp(250.dp.toPx(), 100.dp.toPx(), durationMillis = 500)
},
"verticalReveal_gesture_dragHalfClose",
)
@@ -251,9 +253,9 @@ class ContentRevealTest(private val isFloating: Boolean) {
SceneTransitionLayoutForTesting(
state,
modifier =
- Modifier.padding(50.dp)
+ Modifier.padding(5.dp)
.background(Color.Yellow)
- .size(ContainerSize.width, ContainerSize.height + 200.dp)
+ .size(ContainerSize.width, ContainerSize.height + 100.dp)
.testTag("stl"),
) {
scene(
@@ -298,7 +300,7 @@ class ContentRevealTest(private val isFloating: Boolean) {
companion object {
@get:Parameters @JvmStatic val parameterValues = listOf(true, false)
- val ContainerSize = DpSize(200.dp, 400.dp)
+ val ContainerSize = DpSize(150.dp, 300.dp)
val FlingVelocity = 1000.dp // dp/sec