Merge "Offset ghost views by the containing view's location" into sc-v2-dev

This commit is contained in:
Miranda Kephart
2021-10-04 14:53:49 +00:00
committed by Android (Google) Code Review

View File

@@ -871,6 +871,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
if (view.isAttachedToWindow()) { if (view.isAttachedToWindow()) {
tempMatrix.reset(); tempMatrix.reset();
mSharedElementParentMatrices.get(i).invert(tempMatrix); mSharedElementParentMatrices.get(i).invert(tempMatrix);
decor.transformMatrixToLocal(tempMatrix);
GhostView.addGhost(view, decor, tempMatrix); GhostView.addGhost(view, decor, tempMatrix);
ViewGroup parent = (ViewGroup) view.getParent(); ViewGroup parent = (ViewGroup) view.getParent();
if (moveWithParent && !isInTransitionGroup(parent, decor)) { if (moveWithParent && !isInTransitionGroup(parent, decor)) {