commit 3b4794f6d26a778fe9aa1fa41330b31d764899c4
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 01 21:14:34 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 21:14:34 2019 +0000
tree 56626da21f194e3d2b20ccecbddf85d3869c8ad0
parent 639598245cf06ff62fe77281bbd3a8a13315e425
parent 552071b5f4af63dd6387526f283eadbb92413ff3

Merge "Boost correct layer for Recents Go transition" into ub-launcher3-master

go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java

diff --git a/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
index 051c80f..d1d697c 100644
--- a/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
+++ b/go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java
@@ -173,8 +173,10 @@
 
         // Keep recents visible throughout the animation.
         SurfaceParams[] params = new SurfaceParams[2];
+        // Closing app should stay on top.
+        int boostedMode = MODE_CLOSING;
         params[0] = new SurfaceParams(recentsTarget.leash, 1f, null /* matrix */,
-                null /* windowCrop */, getLayer(recentsTarget, MODE_OPENING), 0 /* cornerRadius */);
+                null /* windowCrop */, getLayer(recentsTarget, boostedMode), 0 /* cornerRadius */);
 
         valueAnimator.addUpdateListener(new MultiValueUpdateListener() {
             private final FloatProp mScaleX;
@@ -214,7 +216,7 @@
                 m.postTranslate(mTranslationX.value, mTranslationY.value);
 
                 params[1] = new SurfaceParams(appTarget.leash, mAlpha.value, m,
-                        null /* windowCrop */, getLayer(appTarget, MODE_CLOSING),
+                        null /* windowCrop */, getLayer(appTarget, boostedMode),
                         0 /* cornerRadius */);
                 surfaceApplier.scheduleApply(params);
             }