diff options
| author | Winson Chung <winsonc@google.com> | 2014-10-15 02:08:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-15 02:08:01 +0000 |
| commit | cbd99dd853078a8b13205a2c017d8bb55e972ab6 (patch) | |
| tree | 888e70a612e1e27c101522fa059e43c18bc74fe4 /packages/SystemUI | |
| parent | c0faa9930712710e3d9f65e07f586cf0d7b6bfaf (diff) | |
| parent | a4ef863c753e6756027c44a539ac02144ce614f9 (diff) | |
| download | frameworks_base-cbd99dd853078a8b13205a2c017d8bb55e972ab6.zip frameworks_base-cbd99dd853078a8b13205a2c017d8bb55e972ab6.tar.gz frameworks_base-cbd99dd853078a8b13205a2c017d8bb55e972ab6.tar.bz2 | |
am a4ef863c: am f4d065e5: Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev
* commit 'a4ef863c753e6756027c44a539ac02144ce614f9':
Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index 5b22524..dfb30f3 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -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); |