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

Commit f97d74b9 authored by Mike Schneider's avatar Mike Schneider
Browse files

Expose [MotionScheme] via [PropertyTransformationScope] 

Bug: 392534646
Test: Existing unit tests
Flag: com.android.systemui.scene_container
Change-Id: I57a59c9faaeb37b4a1e0bdb566f61d79a0d50f09
parent e018f198

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/UserActionDistanceScopeImpl.kt

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.compose.animation.scene



import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

import androidx.compose.material3.MotionScheme

import androidx.compose.ui.geometry.Offset

import androidx.compose.ui.unit.IntSize

import androidx.compose.ui.unit.LayoutDirection
@@ -59,4 +61,8 @@ internal class PropertyTransformationScopeImpl(private val layoutImpl: SceneTran 


    override val layoutDirection: LayoutDirection

        get() = layoutImpl.layoutDirection



    @ExperimentalMaterial3ExpressiveApi

    override val motionScheme: MotionScheme

        get() = layoutImpl.state.motionScheme

}

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/transformation/Transformation.kt

+7 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ package com.android.compose.animation.scene.transformation 


import androidx.compose.animation.core.Easing

import androidx.compose.animation.core.LinearEasing

import androidx.compose.ui.geometry.Offset

import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

import androidx.compose.material3.MotionScheme

import androidx.compose.ui.unit.Density

import androidx.compose.ui.unit.IntSize

import androidx.compose.ui.unit.LayoutDirection
@@ -29,8 +30,8 @@ import com.android.compose.animation.scene.ContentKey 
import com.android.compose.animation.scene.ElementKey

import com.android.compose.animation.scene.ElementMatcher

import com.android.compose.animation.scene.ElementStateScope

import com.android.compose.animation.scene.Scale

import com.android.compose.animation.scene.content.state.TransitionState

import com.android.compose.animation.scene.transformation.PropertyTransformation.Property

import kotlinx.coroutines.CoroutineScope



/** A transformation applied to one or more elements during a transition. */
@@ -126,9 +127,13 @@ interface CustomPropertyTransformation<T> : PropertyTransformation<T> { 
    ): T

}



@OptIn(ExperimentalMaterial3ExpressiveApi::class)

interface PropertyTransformationScope : Density, ElementStateScope {

    /** The current [direction][LayoutDirection] of the layout. */

    val layoutDirection: LayoutDirection



    /** The [MotionScheme] in use by the [SceneTransitionLayout]. */

    val motionScheme: MotionScheme

}



/** Defines the transformation-type to be applied to all elements matching [matcher]. */