Merge "Fix smallClock and smartspace jumping when transitioning from AOD to Lockscreen" into main

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import androidx.compose.runtime.collectAsState

import androidx.compose.runtime.collectAsState

import androidx.compose.runtime.getValue

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.ui.Modifier

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.graphicsLayer

import androidx.compose.ui.graphics.graphicsLayer

import androidx.compose.ui.layout.boundsInWindow

import androidx.compose.ui.layout.boundsInWindow

    params: BurnInParameters,

    params: BurnInParameters,

    isClock: Boolean = false,

    isClock: Boolean = false,

): Modifier {

): Modifier {

    val burnIn = viewModel.movement(params)

    val translationYState = remember { mutableStateOf(0F) }

    val copiedParams = params.copy(translationY = { translationYState.value })

    val burnIn = viewModel.movement(copiedParams)

    val translationX by burnIn.map { it.translationX.toFloat() }.collectAsState(initial = 0f)

    val translationX by burnIn.map { it.translationX.toFloat() }.collectAsState(initial = 0f)

    val translationY by burnIn.map { it.translationY.toFloat() }.collectAsState(initial = 0f)

    val translationY by burnIn.map { it.translationY.toFloat() }.collectAsState(initial = 0f)

    translationYState.value = translationY

    val scaleViewModel by

    val scaleViewModel by

        burnIn

        burnIn

            .map {

            .map {