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

Commit 0ffcfb63 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Exclude pip change from separated display change for mixed case 

DefaultTransitionHandler only needs to animate the change of display.
It also avoid the default handler from releasing the pip leash that
may be used by pip handler later.

Bug: 429267767
Flag: EXEMPT bugfix
Test: With pip1, swipe to enter pip with changing display
      rotation at the same time.
Change-Id: Ia6d1434cabf2e3e934f6876a0e42052737c2ee48
parent ea8e96ba

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ public class DefaultMixedHandler implements MixedTransitionHandler, 
        // In order to play display level animation, force the type to CHANGE (it could be PIP).

        final TransitionInfo changeInfo = info.getType() != TRANSIT_CHANGE

                ? subCopy(info, TRANSIT_CHANGE, true /* withChanges */) : info;

        changeInfo.getChanges().remove(pipChange);

        final MixedTransition mixed = createDefaultMixedTransition(

                MixedTransition.TYPE_ENTER_PIP_WITH_DISPLAY_CHANGE, transition);

        mActiveTransitions.add(mixed);