Merge "Revert^2 "[flexiglass] Add bouncer predictive back motion test"" into main (ccd1feda) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,7 @@ android_library {
		"notification_flags_lib",
		"PlatformComposeCore",
		"PlatformComposeSceneTransitionLayout",
		"PlatformComposeSceneTransitionLayoutTestsUtils",
		"androidx.compose.runtime_runtime",
		"androidx.compose.material3_material3",
		"androidx.compose.material_material-icons-extended",

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,8 @@ private fun SceneScope.BouncerScene(
		BouncerContent(
		viewModel,
		dialogFactory,
		Modifier.sysuiResTag(Bouncer.TestTags.Root)
		.element(Bouncer.Elements.Content)
		Modifier.element(Bouncer.Elements.Content)
		.sysuiResTag(Bouncer.TestTags.Root)
		.fillMaxSize()
		)
		}

packages/SystemUI/tests/goldens/bouncerPredictiveBackMotion.json

0 → 100644

+831 −0

Original line number	Diff line number	Diff line
		{
		"frame_ids": [
		"before",
		0,
		16,
		32,
		48,
		64,
		80,
		96,
		112,
		128,
		144,
		160,
		176,
		192,
		208,
		224,
		240,
		256,
		272,
		288,
		304,
		320,
		336,
		352,
		368,
		384,
		400,
		416,
		432,
		448,
		464,
		480,
		496,
		512,
		528,
		544,
		560,
		576,
		592,
		608,
		624,
		640,
		656,
		672,
		688,
		704,
		720,
		736,
		752,
		768,
		784,
		800,
		816,
		832,
		848,
		864,
		880,
		896,
		912,
		928,
		944,
		960,
		976,
		992,
		1008,
		1024,
		"after"
		],
		"features": [
		{
		"name": "content_alpha",
		"type": "float",
		"data_points": [
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		0.9954499,
		0.9805035,
		0.9527822,
		0.9092045,
		0.84588075,
		0.7583043,
		0.6424476,
		0.49766344,
		0.33080608,
		0.15650165,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		0,
		{
		"type": "not_found"
		}
		]
		},
		{
		"name": "content_scale",
		"type": "scale",
		"data_points": [
		"default",
		{
		"x": 0.9995097,
		"y": 0.9995097,
		"pivot": "unspecified"
		},
		{
		"x": 0.997352,
		"y": 0.997352,
		"pivot": "unspecified"
		},
		{
		"x": 0.990635,
		"y": 0.990635,
		"pivot": "unspecified"
		},
		{
		"x": 0.97249764,
		"y": 0.97249764,
		"pivot": "unspecified"
		},
		{
		"x": 0.94287145,
		"y": 0.94287145,
		"pivot": "unspecified"
		},
		{
		"x": 0.9128026,
		"y": 0.9128026,
		"pivot": "unspecified"
		},
		{
		"x": 0.8859569,
		"y": 0.8859569,
		"pivot": "unspecified"
		},
		{
		"x": 0.8629254,
		"y": 0.8629254,
		"pivot": "unspecified"
		},
		{
		"x": 0.8442908,
		"y": 0.8442908,
		"pivot": "unspecified"
		},
		{
		"x": 0.8303209,
		"y": 0.8303209,
		"pivot": "unspecified"
		},
		{
		"x": 0.8205137,
		"y": 0.8205137,
		"pivot": "unspecified"
		},
		{
		"x": 0.81387186,
		"y": 0.81387186,
		"pivot": "unspecified"
		},
		{
		"x": 0.80941653,
		"y": 0.80941653,
		"pivot": "unspecified"
		},
		{
		"x": 0.80641484,
		"y": 0.80641484,
		"pivot": "unspecified"
		},
		{
		"x": 0.80437464,
		"y": 0.80437464,
		"pivot": "unspecified"
		},
		{
		"x": 0.80297637,
		"y": 0.80297637,
		"pivot": "unspecified"
		},
		{
		"x": 0.80201286,
		"y": 0.80201286,
		"pivot": "unspecified"
		},
		{
		"x": 0.8013477,
		"y": 0.8013477,
		"pivot": "unspecified"
		},
		{
		"x": 0.8008894,
		"y": 0.8008894,
		"pivot": "unspecified"
		},
		{
		"x": 0.8005756,
		"y": 0.8005756,
		"pivot": "unspecified"
		},
		{
		"x": 0.80036324,
		"y": 0.80036324,
		"pivot": "unspecified"
		},
		{
		"x": 0.8002219,
		"y": 0.8002219,
		"pivot": "unspecified"
		},
		{
		"x": 0.80012995,
		"y": 0.80012995,
		"pivot": "unspecified"
		},
		{
		"x": 0.8000721,
		"y": 0.8000721,
		"pivot": "unspecified"
		},
		{
		"x": 0.80003715,
		"y": 0.80003715,
		"pivot": "unspecified"
		},
		{
		"x": 0.8000173,
		"y": 0.8000173,
		"pivot": "unspecified"
		},
		{
		"x": 0.800007,
		"y": 0.800007,
		"pivot": "unspecified"
		},
		{
		"x": 0.8000022,
		"y": 0.8000022,
		"pivot": "unspecified"
		},
		{
		"x": 0.8000004,
		"y": 0.8000004,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.79999995,
		"y": 0.79999995,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"x": 0.8,
		"y": 0.8,
		"pivot": "unspecified"
		},
		{
		"type": "not_found"
		}
		]
		},
		{
		"name": "content_offset",
		"type": "dpOffset",
		"data_points": [
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"x": 0,
		"y": 0.5714286
		},
		{
		"x": 0,
		"y": 2.857143
		},
		{
		"x": 0,
		"y": 7.142857
		},
		{
		"x": 0,
		"y": 13.714286
		},
		{
		"x": 0,
		"y": 23.142857
		},
		{
		"x": 0,
		"y": 36.285713
		},
		{
		"x": 0,
		"y": 53.714287
		},
		{
		"x": 0,
		"y": 75.42857
		},
		{
		"x": 0,
		"y": 100.28571
		},
		{
		"x": 0,
		"y": 126.57143
		},
		{
		"x": 0,
		"y": 151.42857
		},
		{
		"x": 0,
		"y": 174
		},
		{
		"x": 0,
		"y": 193.42857
		},
		{
		"x": 0,
		"y": 210.28572
		},
		{
		"x": 0,
		"y": 224.85715
		},
		{
		"x": 0,
		"y": 237.14285
		},
		{
		"x": 0,
		"y": 247.71428
		},
		{
		"x": 0,
		"y": 256.85715
		},
		{
		"x": 0,
		"y": 264.57144
		},
		{
		"x": 0,
		"y": 271.42856
		},
		{
		"x": 0,
		"y": 277.14285
		},
		{
		"x": 0,
		"y": 282
		},
		{
		"x": 0,
		"y": 286.2857
		},
		{
		"x": 0,
		"y": 289.7143
		},
		{
		"x": 0,
		"y": 292.57144
		},
		{
		"x": 0,
		"y": 294.85715
		},
		{
		"x": 0,
		"y": 296.85715
		},
		{
		"x": 0,
		"y": 298.2857
		},
		{
		"x": 0,
		"y": 299.14285
		},
		{
		"x": 0,
		"y": 299.7143
		},
		{
		"x": 0,
		"y": 300
		},
		{
		"x": 0,
		"y": 0
		},
		{
		"type": "not_found"
		}
		]
		},
		{
		"name": "background_alpha",
		"type": "float",
		"data_points": [
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		1,
		0.9900334,
		0.8403853,
		0.71002257,
		0.5979084,
		0.50182605,
		0.41945767,
		0.34874845,
		0.28797746,
		0.23573697,
		0.19087732,
		0.1524564,
		0.11970067,
		0.091962695,
		0.068702936,
		0.049464583,
		0.033859253,
		0.021552086,
		0.012255073,
		0.005717635,
		0.0017191172,
		6.711483e-05,
		0,
		{
		"type": "not_found"
		}
		]
		}
		]
		}
		No newline at end of file

packages/SystemUI/tests/src/com/android/systemui/bouncer/ui/composable/BouncerPredictiveBackTest.kt

0 → 100644

+348 −0

File added.

Preview size limit exceeded, changes collapsed.