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

Commit 3145c7e9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 643ce041

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



Change-Id: I88df84514f76ec3f9c0292134bb7e0d7cbff1196
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43e1e156 643ce041

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");