Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Protect shared element transitions from removed views." into oc-dev am: 70c1e51bc1 am: 817d37c154"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-05-09 20:25:38 +00:00
committed by Android (Google) Code Review
parent 94de333e30 0328d83fa7
commit 4b02b5ac45
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/app/ActivityTransitionCoordinator.java
View File

@@ -570,8 +570,10 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
// Find the location in the view's parent
ViewGroup parent = (ViewGroup) view.getParent();
Matrix matrix = new Matrix();
parent.transformMatrixToLocal(matrix);
matrix.postTranslate(parent.getScrollX(), parent.getScrollY());
if (parent != null) {
parent.transformMatrixToLocal(matrix);
matrix.postTranslate(parent.getScrollX(), parent.getScrollY());
}
mSharedElementParentMatrices.add(matrix);
}
}
@@ -861,15 +863,17 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
Matrix tempMatrix = new Matrix();
for (int i = 0; i < numSharedElements; i++) {
View view = mSharedElements.get(i);
tempMatrix.reset();
mSharedElementParentMatrices.get(i).invert(tempMatrix);
GhostView.addGhost(view, decor, tempMatrix);
ViewGroup parent = (ViewGroup) view.getParent();
if (moveWithParent && !isInTransitionGroup(parent, decor)) {
GhostViewListeners listener = new GhostViewListeners(view, parent, decor);
parent.getViewTreeObserver().addOnPreDrawListener(listener);
parent.addOnAttachStateChangeListener(listener);
mGhostViewListeners.add(listener);
if (view.isAttachedToWindow()) {
tempMatrix.reset();
mSharedElementParentMatrices.get(i).invert(tempMatrix);
GhostView.addGhost(view, decor, tempMatrix);
ViewGroup parent = (ViewGroup) view.getParent();
if (moveWithParent && !isInTransitionGroup(parent, decor)) {
GhostViewListeners listener = new GhostViewListeners(view, parent, decor);
parent.getViewTreeObserver().addOnPreDrawListener(listener);
parent.addOnAttachStateChangeListener(listener);
mGhostViewListeners.add(listener);
}
}
}
}
@@ -1065,7 +1069,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
@Override
public boolean onPreDraw() {
GhostView ghostView = GhostView.getGhost(mView);
if (ghostView == null) {
if (ghostView == null || !mView.isAttachedToWindow()) {
removeListener();
} else {
GhostView.calculateMatrix(mView, mDecor, mMatrix);