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
This commit is contained in:
Manu Cornet
2016-12-19 13:05:46 -08:00
parent cab02c5b3a
commit 23d22e13e4
2 changed files with 5 additions and 4 deletions

View File

@@ -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;
}

View File

@@ -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);
}