From ae93a9e8cff8533a82ff106f3463338dc7964898 Mon Sep 17 00:00:00 2001
From: Anvesh Renikindi <renikindi@google.com>
Date: Thu, 11 May 2023 17:20:42 +0000
Subject: 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

Change-Id: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
Merged-In: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
(cherry picked from commit 86038cfead9f13ba40aace016f6f58ccaabc91ad)
(cherry picked from commit 08a077d61f9d836bb4c51dd39ac8614d83a74cff)
(cherry picked from commit 542ebe7afa1ec364694e83d689b13285e78ecc5a)
---
 .../src/com/android/compose/animation/Expandable.kt     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt
index d4a81f9c765d..ac1ef1509415 100644
--- a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt
+++ b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt
@@ -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,
-- 
cgit v1.2.3-59-g8ed1b