Merge "Avoid null check on play/pause button" into main (767b9c9a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -621,7 +621,7 @@ private fun ContentScope.CardForegroundContent(
	if (viewModel.actionButtonLayout == MediaCardActionButtonLayout.WithPlayPause) {		if (viewModel.actionButtonLayout == MediaCardActionButtonLayout.WithPlayPause) {
	AnimatedVisibility(visible = viewModel.playPauseAction != null) {		AnimatedVisibility(visible = viewModel.playPauseAction != null) {
	PlayPauseAction(		PlayPauseAction(
	viewModel = checkNotNull(viewModel.playPauseAction),		viewModel = viewModel.playPauseAction,
	buttonSize = playPauseSize,		buttonSize = playPauseSize,
	buttonColor = colorScheme.primary,		buttonColor = colorScheme.primary,
	iconColor = colorScheme.onPrimary,		iconColor = colorScheme.onPrimary,
	@@ -703,7 +703,7 @@ private fun ContentScope.CardForegroundContent(
	if (viewModel.actionButtonLayout == MediaCardActionButtonLayout.WithPlayPause) {		if (viewModel.actionButtonLayout == MediaCardActionButtonLayout.WithPlayPause) {
	AnimatedVisibility(visible = viewModel.playPauseAction != null) {		AnimatedVisibility(visible = viewModel.playPauseAction != null) {
	PlayPauseAction(		PlayPauseAction(
	viewModel = checkNotNull(viewModel.playPauseAction),		viewModel = viewModel.playPauseAction,
	buttonSize = playPauseSize,		buttonSize = playPauseSize,
	buttonColor = colorScheme.primary,		buttonColor = colorScheme.primary,
	iconColor = colorScheme.onPrimary,		iconColor = colorScheme.onPrimary,
	@@ -772,7 +772,7 @@ private fun ContentScope.CompactCardForeground(

	AnimatedVisibility(visible = viewModel.playPauseAction != null) {		AnimatedVisibility(visible = viewModel.playPauseAction != null) {
	PlayPauseAction(		PlayPauseAction(
	viewModel = checkNotNull(viewModel.playPauseAction),		viewModel = viewModel.playPauseAction,
	buttonSize = DpSize(width = 72.dp, height = 48.dp),		buttonSize = DpSize(width = 72.dp, height = 48.dp),
	buttonColor = MaterialTheme.colorScheme.primaryContainer,		buttonColor = MaterialTheme.colorScheme.primaryContainer,
	iconColor = MaterialTheme.colorScheme.onPrimaryContainer,		iconColor = MaterialTheme.colorScheme.onPrimaryContainer,
	@@ -1263,13 +1263,15 @@ private fun DeviceChip(
	/** Renders the primary action of media controls: the play/pause button. */		/** Renders the primary action of media controls: the play/pause button. */
	@Composable		@Composable
	private fun ContentScope.PlayPauseAction(		private fun ContentScope.PlayPauseAction(
	viewModel: MediaPlayPauseActionViewModel,		viewModel: MediaPlayPauseActionViewModel?,
	buttonSize: DpSize,		buttonSize: DpSize,
	buttonColor: Color,		buttonColor: Color,
	iconColor: Color,		iconColor: Color,
	buttonCornerRadius: (isPlaying: Boolean) -> Dp,		buttonCornerRadius: (isPlaying: Boolean) -> Dp,
	modifier: Modifier = Modifier,		modifier: Modifier = Modifier,
	) {		) {
			if (viewModel == null) return

	val cornerRadius: Dp by		val cornerRadius: Dp by
	animateDpAsState(		animateDpAsState(
	targetValue = buttonCornerRadius(viewModel.state != MediaSessionState.Paused),		targetValue = buttonCornerRadius(viewModel.state != MediaSessionState.Paused),