Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev
This commit is contained in:
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user