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

Commit d6c3315a authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Only draw app below launcher for TaskViewSimulator at swipe up or in Overview 

Bug: 160361464
Test: Manual
Change-Id: Ic4d912f1656d87f445a8016640c0eb166cace0d5
parent 70a556da

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

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public abstract class SwipeUpAnimationLogic { 
        mTaskViewSimulator.setLayoutRotation(

                mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),

                mDeviceState.getRotationTouchHelper().getDisplayRotation());

        mTaskViewSimulator.setDrawsBelowRecents(true);

    }



    protected void initTransitionEndpoints(DeviceProfile dp) {

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

+7 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 


    private final Rect mTaskRect = new Rect();

    private float mOffsetY;

    private boolean mDrawsBelowRecents;

    private final PointF mPivot = new PointF();

    private DeviceProfile mDp;
@@ -181,6 +182,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 
        mOffsetY = offsetY;

    }



    public void setDrawsBelowRecents(boolean drawsBelowRecents) {

        mDrawsBelowRecents = drawsBelowRecents;

    }



    /**

     * Adds animation for all the components corresponding to transition from an app to overview.

     */
@@ -320,7 +325,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 
                .withWindowCrop(mTmpCropRect)

                .withCornerRadius(getCurrentCornerRadius());



        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) {

        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mDrawsBelowRecents

                && params.getRecentsSurface() != null) {

            builder.withRelativeLayerTo(params.getRecentsSurface(), Integer.MIN_VALUE);

        }

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+1 −0
Original line number Diff line number Diff line
@@ -475,6 +475,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView 
        mLiveTileTaskViewSimulator.setLayoutRotation(getPagedViewOrientedState().getTouchRotation(),

                getPagedViewOrientedState().getDisplayRotation());

        mLiveTileTaskViewSimulator.setRecentsRotation(rotation);

        mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);

    }



    public OverScroller getScroller() {