Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fdf5a2a authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Android (Google) Code Review
Browse files

Merge "Fix Expandable.kt to work with new Compose prebuilts"

parents e4ac9e47 58f53a33

packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt

+8 −9
Original line number Original line Diff line number Diff line
@@ -70,8 +70,10 @@ import androidx.compose.ui.platform.ComposeView 
import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.platform.LocalContext

import androidx.compose.ui.unit.Density

import androidx.compose.ui.unit.Density

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp

import androidx.lifecycle.ViewTreeLifecycleOwner

import androidx.lifecycle.findViewTreeLifecycleOwner

import androidx.lifecycle.ViewTreeViewModelStoreOwner

import androidx.lifecycle.findViewTreeViewModelStoreOwner

import androidx.lifecycle.setViewTreeLifecycleOwner

import androidx.lifecycle.setViewTreeViewModelStoreOwner

import com.android.systemui.animation.Expandable

import com.android.systemui.animation.Expandable

import com.android.systemui.animation.LaunchAnimator

import com.android.systemui.animation.LaunchAnimator

import kotlin.math.max

import kotlin.math.max
@@ -368,13 +370,10 @@ private fun AnimatedContentInOverlay( 
                    context,

                    context,

                    overlay,

                    overlay,

                )

                )

            ViewTreeLifecycleOwner.set(



                overlayViewGroup,

            overlayViewGroup.setViewTreeLifecycleOwner(composeViewRoot.findViewTreeLifecycleOwner())

                ViewTreeLifecycleOwner.get(composeViewRoot),

            overlayViewGroup.setViewTreeViewModelStoreOwner(

            )

                composeViewRoot.findViewTreeViewModelStoreOwner()

            ViewTreeViewModelStoreOwner.set(

                overlayViewGroup,

                ViewTreeViewModelStoreOwner.get(composeViewRoot),

            )

            )

            ViewTreeSavedStateRegistryOwner.set(

            ViewTreeSavedStateRegistryOwner.set(

                overlayViewGroup,

                overlayViewGroup,