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

Commit f4d065e5 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Fixing regression with screen pinning button not animating for the... 

Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev
parents db8d39f8 ca8686af

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -228,6 +228,8 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
            if (isTaskViewLaunchTargetTask) {

            if (isTaskViewLaunchTargetTask) {

                // Set the dim to 0 so we can animate it in

                // Set the dim to 0 so we can animate it in

                initialDim = 0;

                initialDim = 0;

                // Hide the action button

                mActionButtonView.setAlpha(0f);

            } else if (occludesLaunchTarget) {

            } else if (occludesLaunchTarget) {

                // Move the task view off screen (below) so we can animate it in

                // Move the task view off screen (below) so we can animate it in

                setTranslationY(offscreenY);

                setTranslationY(offscreenY);