commit f7d325a9e76cb1f58f553ab74b84fcbcf0b85db9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 05 00:41:11 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 05 00:41:11 2018 +0000
tree 07b3eeb36098ffad90505b551e36460bb3c1c1fe
parent 7c6027d65cc0aca297da57e432a99e72cb089985
parent 7296dc19b9248739fb1d89b2470263781b7b5425

Merge "Fix crash when launching translucent activities." into ub-launcher3-master

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index dffe641..73cff29 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -154,8 +154,8 @@
                         mLauncher.getStateManager().setCurrentAnimation(anim);
 
                         if (!composeRecentsLaunchAnimator(v, targetCompats, anim)) {
+                            anim.play(getIconAnimator(v));
                             if (launcherIsATargetWithMode(targetCompats, MODE_CLOSING)) {
-                                anim.play(getIconAnimator(v));
                                 anim.play(getLauncherContentAnimator(false /* show */));
                             }
                             anim.play(getWindowAnimators(v, targetCompats));