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

Commit a7eca279 authored by Mike Schneider's avatar Mike Schneider Committed by Android (Google) Code Review
Browse files

Merge "Expose `LookaheadLayout` from #STL" into main

parents ae1cbabd 49b3265f

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

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ interface BaseContentScope : ElementStateScope { 
    /** The state of the [SceneTransitionLayout] in which this content is contained. */

    val layoutState: SceneTransitionLayoutState



    /** The [LookaheadScope] used by the [SceneTransitionLayout]. */

    val lookaheadScope: LookaheadScope



    /**

     * Tag an element identified by [key].

     *

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/content/Content.kt

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.compose.runtime.mutableStateOf 
import androidx.compose.runtime.remember

import androidx.compose.runtime.setValue

import androidx.compose.ui.Modifier

import androidx.compose.ui.layout.LookaheadScope

import androidx.compose.ui.layout.approachLayout

import androidx.compose.ui.platform.testTag

import androidx.compose.ui.unit.IntSize
@@ -119,6 +120,9 @@ internal class ContentScopeImpl( 


    override val layoutState: SceneTransitionLayoutState = layoutImpl.state



    override val lookaheadScope: LookaheadScope

        get() = layoutImpl.lookaheadScope



    private val _verticalOverscrollEffect =

        OffsetOverscrollEffect(

            orientation = Orientation.Vertical,