From 172302686c8dca0526c5a8189644b7e841c60317 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 16 Apr 2020 13:03:48 -0700
Subject: [PATCH] Add resume callback to animate back to appropriate depth.

This fixes the bug where depth gets stuck to 1 after opening a transluscent
activity.

Bug: 152950633
Change-Id: I8bf5f61c57ef79d41656865b1ff1fbadb298fc36
---
 .../launcher3/QuickstepAppTransitionManagerImpl.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index a30e102f07..70cbd828a6 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -291,6 +291,15 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
                     launcherContentAnimator.second.run();
                 }
             });
+        } else {
+            anim.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    mLauncher.addOnResumeCallback(() ->
+                            ObjectAnimator.ofFloat(mLauncher.getDepthController(), DEPTH,
+                            mLauncher.getStateManager().getState().getDepth(mLauncher)).start());
+                }
+            });
         }
     }