diff options
| author | Doris Liu <tianliu@google.com> | 2015-05-07 17:56:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 17:56:46 +0000 |
| commit | c7e56e9df155b678e604ad6402150397d2665f95 (patch) | |
| tree | 69e89d963e9aeb5ea5136a069ebb43109669d1f2 | |
| parent | a4ead5b0d55840be675eee3f11a9dd08bbedaa0d (diff) | |
| parent | 18c2b0ef36400f4af6ee38dd84e2d65d18474b20 (diff) | |
| download | frameworks_base-c7e56e9df155b678e604ad6402150397d2665f95.zip frameworks_base-c7e56e9df155b678e604ad6402150397d2665f95.tar.gz frameworks_base-c7e56e9df155b678e604ad6402150397d2665f95.tar.bz2 | |
Merge "Take into account scroll offset for transition animation" into mnc-dev
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java index 2939322..968c956 100644 --- a/core/java/android/app/ActivityTransitionCoordinator.java +++ b/core/java/android/app/ActivityTransitionCoordinator.java @@ -476,9 +476,8 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { tempRect.set(0, 0, width, height); view.getMatrix().mapRect(tempRect); - ViewGroup parent = (ViewGroup) view.getParent(); - left = leftInParent - tempRect.left + parent.getScrollX(); - top = topInParent - tempRect.top + parent.getScrollY(); + left = leftInParent - tempRect.left; + top = topInParent - tempRect.top; right = left + width; bottom = top + height; } @@ -506,7 +505,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { ViewGroup parent = (ViewGroup) view.getParent(); Matrix matrix = new Matrix(); parent.transformMatrixToLocal(matrix); - + matrix.postTranslate(parent.getScrollX(), parent.getScrollY()); mSharedElementParentMatrices.add(matrix); } } @@ -521,6 +520,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { // Find the location in the view's parent ViewGroup parent = (ViewGroup) viewParent; parent.transformMatrixToLocal(matrix); + matrix.postTranslate(parent.getScrollX(), parent.getScrollY()); } } else { // The indices of mSharedElementParentMatrices matches the |