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

Commit d2e91bac authored by Winson Chung's avatar Winson Chung
Browse files

Take screenshot on ui helper thread in live tile 

- Unify the live tile/non-live tile flow for taking a screenshot
  and post it to the ui helper thread

Bug: 186455799
Test: Test to verify that snapshots are still updated correctly
Change-Id: I26759419adf89c73602589da531bbc494b5c29e3
parent 222b4757

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+14 −20
Original line number Diff line number Diff line
@@ -1408,23 +1408,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }



    protected void switchToScreenshot() {

        final int runningTaskId = mGestureState.getRunningTaskId();

        if (LIVE_TILE.get()) {

            if (mRecentsAnimationController != null) {

                mRecentsAnimationController.getController().setWillFinishToHome(true);

                // Update the screenshot of the task

                if (mTaskSnapshot == null) {

                    mTaskSnapshot = mRecentsAnimationController.screenshotTask(runningTaskId);

                }

                mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot, false /* refreshNow */);

            }

            mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);

        } else if (!hasTargets()) {

        if (!hasTargets()) {

            // If there are no targets, then we don't need to capture anything

            mStateCallback.setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);

        } else {

            final int runningTaskId = mGestureState.getRunningTaskId();

            final boolean refreshView = !LIVE_TILE.get() /* refreshView */;

            boolean finishTransitionPosted = false;

            if (mRecentsAnimationController != null) {

                if (LIVE_TILE.get()) {

                    mRecentsAnimationController.getController().setWillFinishToHome(true);

                }

                // Update the screenshot of the task

                if (mTaskSnapshot == null) {

                    UI_HELPER_EXECUTOR.execute(() -> {
@@ -1433,14 +1427,14 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                                mRecentsAnimationController.screenshotTask(runningTaskId);

                        MAIN_EXECUTOR.execute(() -> {

                            mTaskSnapshot = taskSnapshot;

                            if (!updateThumbnail(runningTaskId)) {

                            if (!updateThumbnail(runningTaskId, refreshView)) {

                                setScreenshotCapturedState();

                            }

                        });

                    });

                    return;

                }

                finishTransitionPosted = updateThumbnail(runningTaskId);

                finishTransitionPosted = updateThumbnail(runningTaskId, refreshView);

            }

            if (!finishTransitionPosted) {

                setScreenshotCapturedState();
@@ -1449,17 +1443,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
    }



    // Returns whether finish transition was posted.

    private boolean updateThumbnail(int runningTaskId) {

    private boolean updateThumbnail(int runningTaskId, boolean refreshView) {

        boolean finishTransitionPosted = false;

        final TaskView taskView;

        if (mGestureState.getEndTarget() == HOME) {

            // Capture the screenshot before finishing the transition to home to ensure it's

            // taken in the correct orientation, but no need to update the thumbnail.

        if (mGestureState.getEndTarget() == HOME || mGestureState.getEndTarget() == NEW_TASK) {

            // Capture the screenshot before finishing the transition to home or quickswitching to

            // ensure it's taken in the correct orientation, but no need to update the thumbnail.

            taskView = null;

        } else {

            taskView = mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot);

            taskView = mRecentsView.updateThumbnail(runningTaskId, mTaskSnapshot, refreshView);

        }

        if (taskView != null && !mCanceled) {

        if (taskView != null && refreshView && !mCanceled) {

            // Defer finishing the animation until the next launcher frame with the

            // new thumbnail

            finishTransitionPosted = ViewUtils.postFrameDrawn(taskView,

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

+0 −5
Original line number Diff line number Diff line
@@ -702,11 +702,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        return taskView;

    }



    /** See {@link #updateThumbnail(int, ThumbnailData, boolean)} */

    public TaskView updateThumbnail(int taskId, ThumbnailData thumbnailData) {

        return updateThumbnail(taskId, thumbnailData, true /* refreshNow */);

    }



    @Override

    protected void onWindowVisibilityChanged(int visibility) {

        super.onWindowVisibilityChanged(visibility);