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

Commit 643ce041 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Only cancel recent animation for change transition including... 

Merge "Merge "Only cancel recent animation for change transition including display" into udc-qpr-dev am: ca88ae4d" into udc-qpr-dev-plus-aosp
parents bf58eda3 a51d8d50

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -604,7 +604,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                } else if (change.getMode() == TRANSIT_CHANGE) {

                    // Finish recents animation if the display is changed, so the default

                    // transition handler can play the animation such as rotation effect.

                    if (change.hasFlags(TransitionInfo.FLAG_IS_DISPLAY)) {

                    if (change.hasFlags(TransitionInfo.FLAG_IS_DISPLAY)

                            && info.getType() == TRANSIT_CHANGE) {

                        // This call to cancel will use the screenshots taken preemptively in

                        // handleMidTransitionRequest() prior to the display changing

                        cancel(mWillFinishToHome, true /* withScreenshots */, "display change");