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

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

Merge "Use CompositingStrategy.ModulateAlpha when fading elements" into main

parents 5dbd01f0 52c0ce0e

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

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.geometry.Offset

import androidx.compose.ui.geometry.isUnspecified

import androidx.compose.ui.geometry.lerp

import androidx.compose.ui.graphics.CompositingStrategy

import androidx.compose.ui.graphics.drawscope.ContentDrawScope

import androidx.compose.ui.graphics.drawscope.scale

import androidx.compose.ui.layout.IntermediateMeasureScope
@@ -473,7 +474,8 @@ private fun IntermediateMeasureScope.place( 
            placeable.place(offset)

        } else {

            placeable.placeWithLayer(offset) {

                this.alpha = elementAlpha(layoutImpl, element, scene)

                alpha = elementAlpha(layoutImpl, element, scene)

                compositingStrategy = CompositingStrategy.ModulateAlpha

            }

        }

    }