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

Commit a7d1f266 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix element elevation" into main

parents 24667c41 16e9ba37
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -173,10 +173,10 @@ internal fun Modifier.element(
    // we can ensure that SceneTransitionLayoutImpl will compose new contents first.
    val currentTransitionStates = getAllNestedTransitionStates(layoutImpl)

    return thenIf(layoutImpl.state.isElevationPossible(content.key, key)) {
    return then(ElementModifier(layoutImpl, currentTransitionStates, content, key))
        .thenIf(layoutImpl.state.isElevationPossible(content.key, key)) {
            Modifier.maybeElevateInContent(layoutImpl, content, key, currentTransitionStates)
        }
        .then(ElementModifier(layoutImpl, currentTransitionStates, content, key))
        .thenIf(layoutImpl.implicitTestTags) { Modifier.testTag(key.testTag) }
}