Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb9c1fc7 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes from topic "stl-distance-contents" into main 

* changes:
  Expose fromContent and toContent to UserActionDistance (1/2)
  Introduce PropertyTransformation.Property
  Make the transition DSL more opaque
  Introduce TransformationMatcher and Transformation.Factory
parents 6cf3d6ba 20b5075e

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

+5 −15
Original line number Diff line number Diff line
@@ -19,11 +19,8 @@ package com.android.systemui.scene.ui.composable.transitions 
import androidx.compose.animation.core.Spring

import androidx.compose.animation.core.spring

import androidx.compose.animation.core.tween

import androidx.compose.foundation.gestures.Orientation

import androidx.compose.ui.unit.IntSize

import com.android.compose.animation.scene.TransitionBuilder

import com.android.compose.animation.scene.UserActionDistance

import com.android.compose.animation.scene.UserActionDistanceScope

import com.android.systemui.media.controls.ui.composable.MediaCarousel

import com.android.systemui.notifications.ui.composable.Notifications

import com.android.systemui.qs.ui.composable.QuickSettings
@@ -31,23 +28,16 @@ import com.android.systemui.shade.ui.composable.Shade 
import com.android.systemui.shade.ui.composable.ShadeHeader

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.goneToSplitShadeTransition(

    durationScale: Double = 1.0,

) {

fun TransitionBuilder.goneToSplitShadeTransition(durationScale: Double = 1.0) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    swipeSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

        )

    distance =

        object : UserActionDistance {

            override fun UserActionDistanceScope.absoluteDistance(

                fromSceneSize: IntSize,

                orientation: Orientation,

            ): Float {

                return fromSceneSize.height.toFloat() * 2 / 3f

            }

    distance = UserActionDistance { fromContent, _, _ ->

        val fromContentSize = checkNotNull(fromContent.targetSize())

        fromContentSize.height.toFloat() * 2 / 3f

    }



    fractionRange(end = .33f) { fade(Shade.Elements.BackgroundScrim) }

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

+5 −15
Original line number Diff line number Diff line
@@ -19,34 +19,24 @@ package com.android.systemui.scene.ui.composable.transitions 
import androidx.compose.animation.core.Spring

import androidx.compose.animation.core.spring

import androidx.compose.animation.core.tween

import androidx.compose.foundation.gestures.Orientation

import androidx.compose.ui.unit.IntSize

import com.android.compose.animation.scene.TransitionBuilder

import com.android.compose.animation.scene.UserActionDistance

import com.android.compose.animation.scene.UserActionDistanceScope

import com.android.systemui.notifications.ui.composable.Notifications

import com.android.systemui.qs.ui.composable.QuickSettings

import com.android.systemui.shade.ui.composable.Shade

import com.android.systemui.shade.ui.composable.ShadeHeader

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.lockscreenToSplitShadeTransition(

    durationScale: Double = 1.0,

) {

fun TransitionBuilder.lockscreenToSplitShadeTransition(durationScale: Double = 1.0) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    swipeSpec =

        spring(

            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

        )

    distance =

        object : UserActionDistance {

            override fun UserActionDistanceScope.absoluteDistance(

                fromSceneSize: IntSize,

                orientation: Orientation,

            ): Float {

                return fromSceneSize.height.toFloat() * 2 / 3f

            }

    distance = UserActionDistance { fromContent, _, _ ->

        val fromContentSize = checkNotNull(fromContent.targetSize())

        fromContentSize.height.toFloat() * 2 / 3f

    }



    fractionRange(end = .33f) { fade(Shade.Elements.BackgroundScrim) }

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

+10 −20
Original line number Diff line number Diff line 
package com.android.systemui.scene.ui.composable.transitions



import androidx.compose.animation.core.tween

import androidx.compose.foundation.gestures.Orientation

import androidx.compose.ui.unit.IntSize

import com.android.compose.animation.scene.Edge

import com.android.compose.animation.scene.TransitionBuilder

import com.android.compose.animation.scene.UserActionDistance

import com.android.compose.animation.scene.UserActionDistanceScope

import com.android.systemui.notifications.ui.composable.Notifications

import com.android.systemui.qs.ui.composable.QuickSettings

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.ui.composable.ShadeHeader

import kotlin.time.Duration.Companion.milliseconds



fun TransitionBuilder.shadeToQuickSettingsTransition(

    durationScale: Double = 1.0,

) {

fun TransitionBuilder.shadeToQuickSettingsTransition(durationScale: Double = 1.0) {

    spec = tween(durationMillis = (DefaultDuration * durationScale).inWholeMilliseconds.toInt())

    distance =

        object : UserActionDistance {

            override fun UserActionDistanceScope.absoluteDistance(

                fromSceneSize: IntSize,

                orientation: Orientation,

            ): Float {

    distance = UserActionDistance { fromContent, _, _ ->

        val distance =

            Notifications.Elements.NotificationScrim.targetOffset(Scenes.Shade)?.y

                        ?: return 0f

                return fromSceneSize.height - distance

            }

                ?: return@UserActionDistance 0f

        val fromContentSize = checkNotNull(fromContent.targetSize())

        fromContentSize.height - distance

    }



    translate(Notifications.Elements.NotificationScrim, Edge.Bottom)
@@ -35,12 +25,12 @@ fun TransitionBuilder.shadeToQuickSettingsTransition( 


    translate(

        ShadeHeader.Elements.CollapsedContentStart,

        y = ShadeHeader.Dimensions.CollapsedHeight

        y = ShadeHeader.Dimensions.CollapsedHeight,

    )

    translate(ShadeHeader.Elements.CollapsedContentEnd, y = ShadeHeader.Dimensions.CollapsedHeight)

    translate(

        ShadeHeader.Elements.ExpandedContent,

        y = -(ShadeHeader.Dimensions.ExpandedHeight - ShadeHeader.Dimensions.CollapsedHeight)

        y = -(ShadeHeader.Dimensions.ExpandedHeight - ShadeHeader.Dimensions.CollapsedHeight),

    )

    translate(ShadeHeader.Elements.ShadeCarrierGroup, y = -ShadeHeader.Dimensions.CollapsedHeight)

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

+3 −2
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ private const val TO_BOUNCER_SWIPE_DISTANCE_FRACTION = 0.5f 
fun TransitionBuilder.toBouncerTransition() {

    spec = tween(durationMillis = 500)



    distance = UserActionDistance { fromSceneSize, _ ->

        fromSceneSize.height * TO_BOUNCER_SWIPE_DISTANCE_FRACTION

    distance = UserActionDistance { fromContent, _, _ ->

        val fromContentSize = checkNotNull(fromContent.targetSize())

        fromContentSize.height * TO_BOUNCER_SWIPE_DISTANCE_FRACTION

    }



    translate(Bouncer.Elements.Content, y = 300.dp)

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

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ fun TransitionBuilder.toQuickSettingsShadeTransition(durationScale: Double = 1.0 
            stiffness = Spring.StiffnessMediumLow,

            visibilityThreshold = Shade.Dimensions.ScrimVisibilityThreshold,

        )

    distance = UserActionDistance { fromSceneSize, _ -> fromSceneSize.height.toFloat() * 2 / 3f }

    distance = UserActionDistance { fromContent, _, _ ->

        val fromContentSize = checkNotNull(fromContent.targetSize())

        fromContentSize.height.toFloat() * 2 / 3f

    }



    translate(OverlayShade.Elements.Panel, Edge.Top)