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

Commit 0dfb6893 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."" into udc-qpr-dev am: e7e7d9d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23656431



Change-Id: I1dba0c3d34cac6850fdcba8dd7970a0339c84853
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bddc6957 e7e7d9d3

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,