Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anvesh Renikindi
2023-06-27 17:04:42 +00:00
committed by Android (Google) Code Review
parent 416d4149c9 08a077d61f
commit e7e7d9d309
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,