commit 7296dc19b9248739fb1d89b2470263781b7b5425
author Winson Chung <winsonc@google.com> Wed Apr 04 17:29:54 2018 -0700
committer Winson Chung <winsonc@google.com> Wed Apr 04 17:29:54 2018 -0700
tree 197952a6a4fbb14d6215504b705ba18878c1b817
parent 8da28f50105f8fdb55b9dfe66df6f86e893108f0

Fix crash when launching translucent activities.

Bug: 77604451
Change-Id: I618d98a437e36e872faee2bbb07d9b8bf8779dbd

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));