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

am c7e56e9d: Merge "Take into account scroll offset for transition animation" into mnc-dev

Browse Source 
* commit 'c7e56e9df155b678e604ad6402150397d2665f95':
  Take into account scroll offset for transition animation
This commit is contained in:
Doris Liu
2015-05-07 18:55:17 +00:00
committed by Android Git Automerger
parent c0ec989b48 c7e56e9df1
commit cbb97b50f8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -476,9 +476,8 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
tempRect.set(0, 0, width, height); tempRect.set(0, 0, width, height);
view.getMatrix().mapRect(tempRect); view.getMatrix().mapRect(tempRect);
ViewGroup parent = (ViewGroup) view.getParent(); left = leftInParent - tempRect.left;
left = leftInParent - tempRect.left + parent.getScrollX(); top = topInParent - tempRect.top;
top = topInParent - tempRect.top + parent.getScrollY();
right = left + width; right = left + width;
bottom = top + height; bottom = top + height;
} }
@@ -506,7 +505,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
ViewGroup parent = (ViewGroup) view.getParent(); ViewGroup parent = (ViewGroup) view.getParent();
Matrix matrix = new Matrix(); Matrix matrix = new Matrix();
parent.transformMatrixToLocal(matrix); parent.transformMatrixToLocal(matrix);
matrix.postTranslate(parent.getScrollX(), parent.getScrollY());
mSharedElementParentMatrices.add(matrix); mSharedElementParentMatrices.add(matrix);
} }
} }
@@ -521,6 +520,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
// Find the location in the view's parent // Find the location in the view's parent
ViewGroup parent = (ViewGroup) viewParent; ViewGroup parent = (ViewGroup) viewParent;
parent.transformMatrixToLocal(matrix); parent.transformMatrixToLocal(matrix);
matrix.postTranslate(parent.getScrollX(), parent.getScrollY());
} }
} else { } else {
// The indices of mSharedElementParentMatrices matches the // The indices of mSharedElementParentMatrices matches the