Merge "Fix sysui crash."

2015-12-16 19:38:50 +00:00
parent fc5151106f 1d61863bd8
commit 6eba3bb352
1 changed files with 1 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java
@@ -341,11 +341,10 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,

        if (launchState.launchedFromAppWithThumbnail) {
            if (mTask.isLaunchTarget) {
+                ctx.postAnimationTrigger.increment();
                // Immediately start the dim animation
                animateDimToProgress(taskViewEnterFromAppDuration,
                        ctx.postAnimationTrigger.decrementOnAnimationEnd());
-                ctx.postAnimationTrigger.increment();
-
                // Animate the action button in
                fadeInActionButton(taskViewEnterFromAppDuration);
            } else {