commit 6eba3bb352c8e09e025559325312bc1057f9331b
author Filip Gruszczynski <gruszczy@google.com> Wed Dec 16 19:38:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 16 19:38:50 2015 +0000
tree 81385663de3c0fb718e7d22b76ab28efb492ec15
parent fc5151106fd3484484e3cf98254e1674dfa5be1e
parent 1d61863bd812a213722ac0beaa695dd3b84b328c

Merge "Fix sysui crash."

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

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 ab51d5f..a6bf8a4 100644
--- 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 @@
 
         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 {