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

Commit 9bf5113e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing taskView sometimes visible during swipe-up transition" into ub-launcher3-master

parents 4b3551e9 a0c9d90e

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -647,6 +647,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
                                mRecentsAnimationWrapper.controller.screenshotTask(app.taskId);

                                mRecentsAnimationWrapper.controller.screenshotTask(app.taskId);

                        TaskView taskView = mRecentsView.updateThumbnail(app.taskId, thumbnail);

                        TaskView taskView = mRecentsView.updateThumbnail(app.taskId, thumbnail);

                        if (taskView != null) {

                        if (taskView != null) {

                            taskView.setAlpha(1);

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

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

                            // new thumbnail

                            // new thumbnail

                            mActivityControlHelper.executeOnNextDraw(mActivity, taskView,

                            mActivityControlHelper.executeOnNextDraw(mActivity, taskView,

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -232,7 +232,6 @@ public abstract class RecentsView<T extends BaseActivity> 
            final TaskView taskView = (TaskView) getChildAt(i);

            final TaskView taskView = (TaskView) getChildAt(i);

            if (taskView.getTask().key.id == taskId) {

            if (taskView.getTask().key.id == taskId) {

                taskView.onTaskDataLoaded(taskView.getTask(), thumbnailData);

                taskView.onTaskDataLoaded(taskView.getTask(), thumbnailData);

                taskView.setAlpha(1);

                return taskView;

                return taskView;

            }

            }

        }

        }