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

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

Merge "Merge "Fix Pair-to-Pair animation being canceled in recents transition... 

Merge "Merge "Fix Pair-to-Pair animation being canceled in recents transition handler." into udc-dev am: 0d295f9d" into udc-dev-plus-aosp
parents ce5aaff2 f4426760

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

+2 −2
Original line number Diff line number Diff line
@@ -595,8 +595,8 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler { 
                        cancel(mWillFinishToHome, true /* withScreenshots */, "display change");

                        return;

                    }

                    // Don't consider order-only changes as changing apps.

                    if (!TransitionUtil.isOrderOnly(change)) {

                    // Don't consider order-only & non-leaf changes as changing apps.

                    if (!TransitionUtil.isOrderOnly(change) && isLeafTask) {

                        hasChangingApp = true;

                    }

                }