Merge "2D recents: fix the app -> recents animation" (18f0d651) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -721,7 +721,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();
		@@ -771,7 +771,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;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -881,10 +881,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);
		}