Merge "MM: Enable RevealEffect in DualShade" into main (20710f8a) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/ToQuickSettingsShadeTransition.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,12 @@ fun TransitionBuilder.toQuickSettingsShadeTransition(
		) {
		spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

		verticalContainerReveal(QuickSettingsShade.Elements.Panel, shadeExpansionMotion, revealHaptics)
		verticalContainerReveal(
		container = QuickSettingsShade.Elements.Panel,
		motionSpec = shadeExpansionMotion,
		haptics = revealHaptics,
		useMechanics = true,
		)

		fractionRange(end = .5f) { fade(OverlayShade.Elements.Scrim) }
		fractionRange(start = .5f) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ fun TransitionBuilder.verticalContainerReveal(
		container: ElementKey,
		motionSpec: VerticalExpandContainerSpec,
		haptics: ContainerRevealHaptics,
		useMechanics: Boolean = VerticalContainerRevealFlag.isEnabled,
		) {
		// Make the swipe distance be exactly the target height of the container.
		// TODO(b/376438969): Make sure that this works correctly when the target size of the element
		@@ -75,7 +76,7 @@ fun TransitionBuilder.verticalContainerReveal(
		(targetSizeInToContent?.height ?: targetSizeInFromContent?.height)?.toFloat() ?: 0f
		}

		if (!VerticalContainerRevealFlag.isEnabled) {
		if (!useMechanics) {
		scaleSize(container, height = 0f)
		return
		}

+6 −9

Original line number	Diff line number	Diff line
		@@ -45,14 +45,11 @@ import com.android.compose.animation.scene.SceneKey
		import com.android.compose.animation.scene.SceneTransitionLayoutForTesting
		import com.android.compose.animation.scene.Swipe
		import com.android.compose.animation.scene.featureOfElement
		import com.android.compose.animation.scene.mechanics.VerticalContainerRevealFlag
		import com.android.compose.animation.scene.transitions
		import com.android.mechanics.behavior.VerticalExpandContainerSpec
		import com.android.mechanics.behavior.verticalExpandContainerBackground
		import kotlin.math.sin
		import kotlinx.coroutines.CoroutineScope
		import org.junit.Assume
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -93,11 +90,6 @@ class ContentRevealTest(private val isFloating: Boolean) {

		private val motionSpec = VerticalExpandContainerSpec(isFloating)

		@Before
		fun setUp() {
		Assume.assumeTrue(VerticalContainerRevealFlag.isEnabled)
		}

		@Test
		fun verticalReveal_triggeredRevealOpenTransition() {
		assertVerticalContainerRevealMotion(
		@@ -208,7 +200,12 @@ class ContentRevealTest(private val isFloating: Boolean) {
		motionRule.runTest {
		val transitions = transitions {
		from(SceneClosed, to = SceneOpen) {
		verticalContainerReveal(RevealElement, motionSpec, fakeHaptics)
		verticalContainerReveal(
		container = RevealElement,
		motionSpec = motionSpec,
		haptics = fakeHaptics,
		useMechanics = true,
		)
		}
		}