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

Commit 26ef4c4c authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Fix warning log in DialogLaunchAnimator" into tm-qpr-dev am: 7206db68 am: 3253c7a2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20980298



Change-Id: I6734c8416765dcc64d5fcf629f819dff8e6c06a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be4018e7 3253c7a2

packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt

+7 −3
Original line number Diff line number Diff line
@@ -237,13 +237,17 @@ constructor( 
            openedDialogs.firstOrNull {

                it.dialog.window.decorView.viewRootImpl == controller.viewRoot

            }

        val animateFrom =

        val controller =

            animatedParent?.dialogContentWithBackground?.let {

                Controller.fromView(it, controller.cuj)

            }

                ?: controller



        if (animatedParent == null && animateFrom !is LaunchableView) {

        if (

            animatedParent == null &&

                controller is ViewDialogLaunchAnimatorController &&

                controller.source !is LaunchableView

        ) {

            // Make sure the View we launch from implements LaunchableView to avoid visibility

            // issues. Given that we don't own dialog decorViews so we can't enforce it for launches

            // from a dialog.
@@ -272,7 +276,7 @@ constructor( 
                launchAnimator,

                callback,

                interactionJankMonitor,

                animateFrom,

                controller,

                onDialogDismissed = { openedDialogs.remove(it) },

                dialog = dialog,

                animateBackgroundBoundsChange,

packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.internal.jank.InteractionJankMonitor 
/** A [DialogLaunchAnimator.Controller] that can animate a [View] from/to a dialog. */

class ViewDialogLaunchAnimatorController

internal constructor(

    private val source: View,

    internal val source: View,

    override val cuj: DialogCuj?,

) : DialogLaunchAnimator.Controller {

    override val viewRoot: ViewRootImpl?