commit 81c0cac4574915a6bf77955bbb74ecc1cde79c6f
author Tracy Zhou <tracyzhou@google.com> Thu Aug 13 11:01:15 2020 -0700
committer Tracy Zhou <tracyzhou@google.com> Thu Aug 13 11:01:15 2020 -0700
tree 146f27efe95f0e7bcdf23618b1ce9003e72a21e1
parent 72385839ed9038607e186c198ce31a54c52778a4

[Live Tile] Place the target app back above Launcher when swipe up end target is home

Test: manual
Bug: 160361464
Change-Id: Ic2b332774fe3f25f36f0bfd2b5e6cf66fb1d09dd

quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
index 282f6fa..2ca07ec 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1059,6 +1059,7 @@
         }
 
         if (mGestureState.getEndTarget() == HOME) {
+            mTaskViewSimulator.setDrawsBelowRecents(false);
             HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);
             RectFSpringAnim windowAnim = createWindowAnimationToHome(start, homeAnimFactory);
             windowAnim.addAnimatorListener(new AnimationSuccessListener() {

quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index e5f4d38..903e87a 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -325,9 +325,10 @@
                 .withWindowCrop(mTmpCropRect)
                 .withCornerRadius(getCurrentCornerRadius());
 
-        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mDrawsBelowRecents
-                && params.getRecentsSurface() != null) {
-            builder.withRelativeLayerTo(params.getRecentsSurface(), Integer.MIN_VALUE);
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {
+            // When relativeLayer = 0, it reverts the surfaces back to the original order.
+            builder.withRelativeLayerTo(params.getRecentsSurface(),
+                    mDrawsBelowRecents ? Integer.MIN_VALUE : 0);
         }
     }