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

Commit 46715106 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Ensure new task leashes passed to recents animation are initially... 

Merge "Ensure new task leashes passed to recents animation are initially hidden" into rvc-dev am: a81bd220 am: 3a3431c9

Change-Id: I6e3c774fab672ca4b5703b0cab2bb6c1ff262d81
parents 2eb8d521 3a3431c9

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

+5 −4
Original line number Diff line number Diff line
@@ -421,16 +421,17 @@ public class RecentsAnimationController implements DeathRecipient { 


    @VisibleForTesting

    AnimationAdapter addAnimation(Task task, boolean isRecentTaskInvisible) {

        return addAnimation(task, isRecentTaskInvisible, null /* finishedCallback */);

        return addAnimation(task, isRecentTaskInvisible, false /* hidden */,

                null /* finishedCallback */);

    }



    @VisibleForTesting

    AnimationAdapter addAnimation(Task task, boolean isRecentTaskInvisible,

    AnimationAdapter addAnimation(Task task, boolean isRecentTaskInvisible, boolean hidden,

            OnAnimationFinishedCallback finishedCallback) {

        ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "addAnimation(%s)", task.getName());

        final TaskAnimationAdapter taskAdapter = new TaskAnimationAdapter(task,

                isRecentTaskInvisible);

        task.startAnimation(task.getPendingTransaction(), taskAdapter, false /* hidden */,

        task.startAnimation(task.getPendingTransaction(), taskAdapter, hidden,

                ANIMATION_TYPE_RECENTS, finishedCallback);

        task.commitPendingTransaction();

        mPendingAnimations.add(taskAdapter);
@@ -530,7 +531,7 @@ public class RecentsAnimationController implements DeathRecipient { 
        final SparseBooleanArray recentTaskIds =

                mService.mAtmService.getRecentTasks().getRecentTaskIds();

        TaskAnimationAdapter adapter = (TaskAnimationAdapter) addAnimation(task,

                !recentTaskIds.get(task.mTaskId), finishedCallback);

                !recentTaskIds.get(task.mTaskId), true /* hidden */, finishedCallback);

        mPendingNewTaskTargets.add(task.mTaskId);

        return adapter.createRemoteAnimationTarget();

    }