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

Commit 2591768d authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Finish recents animation on task dismissal only if the task is a live tile task 

Fixes: 191831190
Test: manual
Change-Id: Ie1dd02a2e8cc401a613a0ed2199400712c6d5291
parent a829f96b

quickstep/src/com/android/quickstep/views/RecentsView.java

+12 −6
Original line number Diff line number Diff line
@@ -2421,12 +2421,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                if (success) {

                    if (shouldRemoveTask) {

                        if (dismissedTaskView.getTask() != null) {

                            if (LIVE_TILE.get() && dismissedTaskView.isRunningTask()) {

                                finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,

                                    () -> {

                                UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->

                                        ActivityManagerWrapper.getInstance().removeTask(

                                                dismissedTaskId), REMOVE_TASK_WAIT_FOR_APP_STOP_MS);

                            });

                                        () -> removeTaskInternal(dismissedTaskId));

                            } else {

                                removeTaskInternal(dismissedTaskId);

                            }

                            mActivity.getStatsLogManager().logger()

                                    .withItemInfo(dismissedTaskView.getItemInfo())

                                    .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
@@ -2472,6 +2472,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        return anim;

    }



    private void removeTaskInternal(int dismissedTaskId) {

        UI_HELPER_EXECUTOR.getHandler().postDelayed(

                () -> ActivityManagerWrapper.getInstance().removeTask(dismissedTaskId),

                REMOVE_TASK_WAIT_FOR_APP_STOP_MS);

    }



    /**

     * @return {@code true} if one of the task thumbnails would intersect/overlap with the

     *         {@link #mSplitPlaceholderView}