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

Commit 8de93f58 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Always cancel the ongoing recents transition when removing PIP" into main

parents f71fb76d e0ba9bb4

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

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler, 
                return;

            }



            if (info.getType() == TRANSIT_REMOVE_PIP && PipFlags.isPip2ExperimentEnabled()) {

            if (info.getType() == TRANSIT_REMOVE_PIP) {

                ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                        "[%d] RecentsController.merge: transit_remove_pip", mInstanceId);

                // Cancel the merge if transition is removing PiP; PiP is on top of everything else.