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

Merge "Preserve Composable state when expanding it" into tm-qpr-dev am: 7538326223

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

Change-Id: I64742dc42a820bc9c45ef138c52275f26d412d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jordan Demeulenaere
2023-01-16 12:39:14 +00:00
committed by Automerger Merge Worker
parent c6217905c1 7538326223
commit 9ec0b786bc
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,7 @@ import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.State import androidx.compose.runtime.State
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.movableContentOf
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCompositionContext import androidx.compose.runtime.rememberCompositionContext
@@ -73,6 +74,7 @@ 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.ViewTreeLifecycleOwner
import androidx.lifecycle.ViewTreeViewModelStoreOwner import androidx.lifecycle.ViewTreeViewModelStoreOwner
import com.android.compose.runtime.movableContentOf
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
@@ -170,10 +172,9 @@ fun Expandable(
val contentColor = controller.contentColor val contentColor = controller.contentColor
val shape = controller.shape val shape = controller.shape
// TODO(b/230830644): Use movableContentOf to preserve the content state instead once the
// Compose libraries have been updated and include aosp/2163631.
val wrappedContent = val wrappedContent =
@Composable { controller: ExpandableController -> remember(content) {
movableContentOf { expandable: Expandable ->
CompositionLocalProvider( CompositionLocalProvider(
LocalContentColor provides contentColor, LocalContentColor provides contentColor,
) { ) {
@@ -181,14 +182,15 @@ fun Expandable(
// 40.dp, which is the same as the M3 buttons. This applies even if onClick is // 40.dp, which is the same as the M3 buttons. This applies even if onClick is
// null, to make it easier to write expandables that are sometimes clickable and // null, to make it easier to write expandables that are sometimes clickable and
// sometimes not. There shouldn't be any Expandable smaller than 40dp because if // sometimes not. There shouldn't be any Expandable smaller than 40dp because if
// the expandable is not clickable directly, then something in its content should // the expandable is not clickable directly, then something in its content
// be (and with a size >= 40dp). // should be (and with a size >= 40dp).
val minSize = 40.dp val minSize = 40.dp
Box( Box(
Modifier.defaultMinSize(minWidth = minSize, minHeight = minSize), Modifier.defaultMinSize(minWidth = minSize, minHeight = minSize),
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
) { ) {
content(controller.expandable) content(expandable)
}
} }
} }
} }
@@ -270,7 +272,7 @@ fun Expandable(
.onGloballyPositioned { .onGloballyPositioned {
controller.boundsInComposeViewRoot.value = it.boundsInRoot() controller.boundsInComposeViewRoot.value = it.boundsInRoot()
} }
) { wrappedContent(controller) } ) { wrappedContent(controller.expandable) }
} }
else -> { else -> {
val clickModifier = val clickModifier =
@@ -301,7 +303,7 @@ fun Expandable(
controller.boundsInComposeViewRoot.value = it.boundsInRoot() controller.boundsInComposeViewRoot.value = it.boundsInRoot()
}, },
) { ) {
wrappedContent(controller) wrappedContent(controller.expandable)
} }
} }
} }
@@ -315,7 +317,7 @@ private fun AnimatedContentInOverlay(
animatorState: State<LaunchAnimator.State?>, animatorState: State<LaunchAnimator.State?>,
overlay: ViewGroupOverlay, overlay: ViewGroupOverlay,
controller: ExpandableControllerImpl, controller: ExpandableControllerImpl,
content: @Composable (ExpandableController) -> Unit, content: @Composable (Expandable) -> Unit,
composeViewRoot: View, composeViewRoot: View,
onOverlayComposeViewChanged: (View?) -> Unit, onOverlayComposeViewChanged: (View?) -> Unit,
density: Density, density: Density,
@@ -370,7 +372,7 @@ private fun AnimatedContentInOverlay(
// We center the content in the expanding container. // We center the content in the expanding container.
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
) { ) {
Box(contentModifier) { content(controller) } Box(contentModifier) { content(controller.expandable) }
} }
} }
} }