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

* commit 'f4d065e5867eda35f13c13dd9e979d1bc3d78e8a':
  Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
This commit is contained in:
Winson Chung
2014-10-14 23:12:22 +00:00
committed by Android Git Automerger

View File

@@ -228,6 +228,8 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
if (isTaskViewLaunchTargetTask) {
// Set the dim to 0 so we can animate it in
initialDim = 0;
// Hide the action button
mActionButtonView.setAlpha(0f);
} else if (occludesLaunchTarget) {
// Move the task view off screen (below) so we can animate it in
setTranslationY(offscreenY);