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

Commit 3e2b3181 authored by Chris Li's avatar Chris Li
Browse files

Don't skip animation for AE transition without split layout change 

Bug: 328998607
Test: verify with split of A|B -> B|C
Change-Id: I1950e386bf4d15f922ec00d83a61877984842878
parent 00481176

libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java

+27 −7
Original line number Diff line number Diff line
@@ -523,8 +523,8 @@ class ActivityEmbeddingAnimationRunner { 
    /**

     * Whether we should use jump cut for the change transition.

     * This normally happens when opening a new secondary with the existing primary using a

     * different split layout. This can be complicated, like from horizontal to vertical split with

     * new split pairs.

     * different split layout (ratio or direction). This can be complicated, like from horizontal to

     * vertical split with new split pairs.

     * Uses a jump cut animation to simplify.

     */

    private boolean shouldUseJumpCutForChangeTransition(@NonNull TransitionInfo info) {
@@ -553,8 +553,8 @@ class ActivityEmbeddingAnimationRunner { 
        }



        // Check if the transition contains both opening and closing windows.

        boolean hasOpeningWindow = false;

        boolean hasClosingWindow = false;

        final List<TransitionInfo.Change> openChanges = new ArrayList<>();

        final List<TransitionInfo.Change> closeChanges = new ArrayList<>();

        for (TransitionInfo.Change change : info.getChanges()) {

            if (changingChanges.contains(change)) {

                continue;
@@ -564,10 +564,30 @@ class ActivityEmbeddingAnimationRunner { 
                // No-op if it will be covered by the changing parent window.

                continue;

            }

            hasOpeningWindow |= TransitionUtil.isOpeningType(change.getMode());

            hasClosingWindow |= TransitionUtil.isClosingType(change.getMode());

            if (TransitionUtil.isOpeningType(change.getMode())) {

                openChanges.add(change);

            } else if (TransitionUtil.isClosingType(change.getMode())) {

                closeChanges.add(change);

            }

        }

        if (openChanges.isEmpty() || closeChanges.isEmpty()) {

            // Only skip if the transition contains both open and close.

            return false;

        }

        return hasOpeningWindow && hasClosingWindow;

        if (changingChanges.size() != 1 || openChanges.size() != 1 || closeChanges.size() != 1) {

            // Skip when there are too many windows involved.

            return true;

        }

        final TransitionInfo.Change changingChange = changingChanges.get(0);

        final TransitionInfo.Change openChange = openChanges.get(0);

        final TransitionInfo.Change closeChange = closeChanges.get(0);

        if (changingChange.getStartAbsBounds().equals(openChange.getEndAbsBounds())

                && changingChange.getEndAbsBounds().equals(closeChange.getStartAbsBounds())) {

            // Don't skip if the transition is a simple shifting without split direction or ratio

            // change. For example, A|B -> B|C.

            return false;

        }

        return true;

    }



    /** Updates the changes to end states in {@code startTransaction} for jump cut animation. */