commit 920b04bdd242991a6fc29e4dceb32a80d38371d0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 16 22:03:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 16 22:03:30 2020 +0000
tree 6ef8e59f11ef5af3fa744126ec85f5fb33f9bfed
parent c9e1375ed55a2017a9661f96feae80a498150e1a
parent 74974e802e773dbe82a4bfda5194d7932b363d1f

Merge "Add resume callback to animate back to appropriate depth." into ub-launcher3-rvc-dev am: 74974e802e

Change-Id: I36f309cf90de5d537698d4219be48bc348dca3ee

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

diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index a30e102..70cbd82 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -291,6 +291,15 @@
                     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());
+                }
+            });
         }
     }