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

Commit 23d22e13 authored by Manu Cornet's avatar Manu Cornet
Browse files

2D recents: fix the app -> recents animation 

Bug: 33752154
Bug: 32101881
Test: On local sw600dp device, tested the new transition in landscape & portrait
Change-Id: I326176734e8d34d2a49b8ada687c66838b0e952f
parent cab02c5b

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
                if (task.isFreeformTask()) {

                    mTmpTransform = stackLayout.getStackTransformScreenCoordinates(task,

                            stackScroller.getStackScroll(), mTmpTransform, null,

                            windowOverrideRect);

                            windowOverrideRect, false /* useGridLayout */);

                    Bitmap thumbnail = drawThumbnailTransitionBitmap(task, mTmpTransform,

                            mThumbTransitionBitmapCache);

                    Rect toTaskRect = new Rect();
@@ -770,7 +770,8 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
        stackView.updateLayoutAlgorithm(true /* boundScroll */);

        stackView.updateToInitialState();

        stackView.getStackAlgorithm().getStackTransformScreenCoordinates(launchTask,

                stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect);

                stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect,

                Recents.getConfiguration().isGridEnabled);

        return mTmpTransform;

    }

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java

+2 −2
Original line number Diff line number Diff line
@@ -876,10 +876,10 @@ public class TaskStackLayoutAlgorithm { 
     */

    public TaskViewTransform getStackTransformScreenCoordinates(Task task, float stackScroll,

            TaskViewTransform transformOut, TaskViewTransform frontTransform,

            Rect windowOverrideRect) {

            Rect windowOverrideRect, boolean useGridLayout) {

        TaskViewTransform transform = getStackTransform(task, stackScroll, mFocusState,

                transformOut, frontTransform, true /* forceUpdate */,

                false /* ignoreTaskOverrides */, false /* useGridLayout */);

                false /* ignoreTaskOverrides */, useGridLayout);

        return transformToScreenCoordinates(transform, windowOverrideRect);

    }