Merge "Offset ghost views by the containing view's location" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a7d22696a5
@@ -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)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user