Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a472fbd authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "[Live Tile] Place the target app back above Launcher when swipe up end... 

Merge "[Live Tile] Place the target app back above Launcher when swipe up end target is home" into ub-launcher3-master
parents a9f95517 81c0cac4

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

+1 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends 
        }



        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

+4 −3
Original line number Diff line number Diff line
@@ -325,9 +325,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 
                .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);

        }

    }