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

Commit 1efe5fd7 authored by Omar Elmekkawy's avatar Omar Elmekkawy Committed by Android Build Coastguard Worker
Browse files

Cancel veil animation before returning a show transaction. 

Flag: EXEMPT BUGFIX
Test: on device testing, logic is private can't be unit tested
Bug: 445323460
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:3732f513ca51da37762effe644826872fb571cf1
Merged-In: I10f970f3f3d2551fc83adae5396ca2b59a0c8903
Change-Id: I10f970f3f3d2551fc83adae5396ca2b59a0c8903
parent 2a0a7f85

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/ResizeVeil.kt

+17 −0
Original line number Diff line number Diff line
@@ -235,6 +235,10 @@ constructor( 
                            override fun onAnimationEnd(animation: Animator) {

                                veilAnimT.setAlpha(background, 1f).apply()

                            }



                            override fun onAnimationCancel(animation: Animator) {

                                onAnimationEnd(animation)

                            }

                        }

                    )

                }
@@ -252,6 +256,10 @@ constructor( 
                            override fun onAnimationEnd(animation: Animator) {

                                iconAnimT.setAlpha(icon, 1f).apply()

                            }



                            override fun onAnimationCancel(animation: Animator) {

                                onAnimationEnd(animation)

                            }

                        }

                    )

                }
@@ -284,6 +292,7 @@ constructor( 
            t.reparent(veil, parent)

            parentSurface = parent

        }

        cancelAnimation()

        val backgroundColor =

            when (decorThemeUtil.getAppTheme(taskInfo)) {

                Theme.LIGHT -> lightColors.surfaceContainer
@@ -390,6 +399,10 @@ constructor( 
                        override fun onAnimationEnd(animation: Animator) {

                            surfaceControlTransactionSupplier.get().hide(background).apply()

                        }



                        override fun onAnimationCancel(animation: Animator) {

                            onAnimationEnd(animation)

                        }

                    }

                )

            }
@@ -407,6 +420,10 @@ constructor( 
                        override fun onAnimationEnd(animation: Animator) {

                            surfaceControlTransactionSupplier.get().hide(icon).apply()

                        }



                        override fun onAnimationCancel(animation: Animator) {

                            onAnimationEnd(animation)

                        }

                    }

                )

            }