Merge "Move chips behind the pill" into main (fb0d6974) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/AmbientCueContainer.kt

+20 −20

Original line number	Diff line number	Diff line
		@@ -138,6 +138,17 @@ private fun TaskBarAnd3ButtonAmbientCue(
		translationY = screenHeightPx - size.height
		},
		)
		ActionList(
		actions = actions,
		visible = visible && expanded,
		onDismiss = { viewModel.collapse() },
		horizontalAlignment = Alignment.End,
		modifier =
		modifier.graphicsLayer {
		translationX = screenWidthPx - size.width - actionsHorizontalPaddingPx
		translationY = pillCenter.y - size.height - actionsVerticalPaddingPx
		},
		)
		ShortPill(
		actions = actions,
		visible = visible,
		@@ -173,17 +184,6 @@ private fun TaskBarAnd3ButtonAmbientCue(
		onClick = { viewModel.expand() },
		onCloseClick = { viewModel.hide() },
		)
		ActionList(
		actions = actions,
		visible = visible && expanded,
		onDismiss = { viewModel.collapse() },
		horizontalAlignment = Alignment.End,
		modifier =
		modifier.graphicsLayer {
		translationX = screenWidthPx - size.width - actionsHorizontalPaddingPx
		translationY = pillCenter.y - size.height - actionsVerticalPaddingPx
		},
		)
		}

		@Composable
		@@ -203,15 +203,6 @@ private fun NavBarAmbientCue(

		LaunchedEffect(expanded) { onShouldInterceptTouches(expanded, null) }
		BackgroundGlow(visible = visible, expanded = expanded, modifier = modifier)
		NavBarPill(
		actions = actions,
		navBarWidth = navBarWidth,
		visible = visible,
		expanded = expanded,
		modifier = modifier.padding(bottom = 4.dp),
		onClick = { viewModel.expand() },
		onCloseClick = { viewModel.hide() },
		)
		ActionList(
		actions = actions,
		visible = visible && expanded,
		@@ -223,6 +214,15 @@ private fun NavBarAmbientCue(
		end = ACTIONS_HORIZONTAL_PADDING.dp,
		),
		)
		NavBarPill(
		actions = actions,
		navBarWidth = navBarWidth,
		visible = visible,
		expanded = expanded,
		modifier = modifier.padding(bottom = 4.dp),
		onClick = { viewModel.expand() },
		onCloseClick = { viewModel.hide() },
		)
		}

		private const val NAV_BAR_WIDTH_DP = 108 // R.dimen.taskbar_stashed_small_screen from Launcher