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

Commit 7d94e5ad authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix scrim offset to (0,0) for letterboxed cross-activity-back" into main

parents e326b351 fb809cc7

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt

+5 −1
Original line number Diff line number Diff line
@@ -283,7 +283,11 @@ class CrossActivityBackAnimation @Inject constructor( 
        scrimLayer = scrimBuilder.build()

        val colorComponents = floatArrayOf(0f, 0f, 0f)

        maxScrimAlpha = if (isDarkTheme) MAX_SCRIM_ALPHA_DARK else MAX_SCRIM_ALPHA_LIGHT

        val scrimCrop = if (isLetterboxed) backAnimRect else closingTarget!!.localBounds

        val scrimCrop = if (isLetterboxed) {

            closingTarget!!.windowConfiguration.bounds

        } else {

            closingTarget!!.localBounds

        }

        transaction

            .setColor(scrimLayer, colorComponents)

            .setAlpha(scrimLayer!!, maxScrimAlpha)