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

Commit 0b87da71 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix recents thumbnail wrong while swipe up" into tm-dev

parents 8b8de88b 92209376

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
    }



    RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel, RemoteAnimationTarget[] apps) {

        if (ENABLE_SHELL_TRANSITIONS || apps.length < 2) return null;

        if (ENABLE_SHELL_TRANSITIONS || !isSplitScreenVisible()) return null;

        // TODO(b/206487881): Integrate this with shell transition.

        SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();

        if (mSplitTasksContainerLayer != null) {

services/core/java/com/android/server/wm/RecentsAnimationController.java

+2 −2
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ public class RecentsAnimationController implements DeathRecipient { 
        }



        final int taskCount = visibleTasks.size();

        for (int i = 0; i < taskCount; i++) {

        for (int i = taskCount - 1; i >= 0; i--) {

            final Task task = visibleTasks.get(i);

            if (skipAnimation(task)) {

                continue;
@@ -746,7 +746,7 @@ public class RecentsAnimationController implements DeathRecipient { 
                ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,

                        "collectTaskRemoteAnimations, target: %s", target);

            }

        }, true);

        }, false /* traverseTopToBottom */);

    }



    void logRecentsAnimationStartTime(int durationMs) {