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

Commit 7e15d051 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Cherrypicker Worker
Browse files

Revert "Revert "Fix Expandable.kt to work with new Compose prebu..." 

Revert submission 23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

Reason for revert: <b/281883862 is fixed >

Reverted changes: /q/submissionid:23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:86038cfead9f13ba40aace016f6f58ccaabc91ad)
Merged-In: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
Change-Id: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
parent ffd69761

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

+8 −9
Original line number 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.unit.Density

import androidx.compose.ui.unit.dp

import androidx.lifecycle.ViewTreeLifecycleOwner

import androidx.lifecycle.ViewTreeViewModelStoreOwner

import androidx.lifecycle.findViewTreeLifecycleOwner

import androidx.lifecycle.findViewTreeViewModelStoreOwner

import androidx.lifecycle.setViewTreeLifecycleOwner

import androidx.lifecycle.setViewTreeViewModelStoreOwner

import com.android.systemui.animation.Expandable

import com.android.systemui.animation.LaunchAnimator

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

                    overlay,

                )

            ViewTreeLifecycleOwner.set(

                overlayViewGroup,

                ViewTreeLifecycleOwner.get(composeViewRoot),

            )

            ViewTreeViewModelStoreOwner.set(

                overlayViewGroup,

                ViewTreeViewModelStoreOwner.get(composeViewRoot),



            overlayViewGroup.setViewTreeLifecycleOwner(composeViewRoot.findViewTreeLifecycleOwner())

            overlayViewGroup.setViewTreeViewModelStoreOwner(

                composeViewRoot.findViewTreeViewModelStoreOwner()

            )

            ViewTreeSavedStateRegistryOwner.set(

                overlayViewGroup,