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 am: e7e7d9d309

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

Change-Id: I1dba0c3d34cac6850fdcba8dd7970a0339c84853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anvesh Renikindi
2023-06-27 17:29:30 +00:00
committed by Automerger Merge Worker
parent bddc69575c e7e7d9d309
commit 0dfb6893d4
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.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,