diff options
| author | George Mount <mount@google.com> | 2015-06-25 08:52:25 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2015-06-25 08:52:25 -0700 |
| commit | e1eea177bd4993151679183e88171f1e50c33054 (patch) | |
| tree | 30304be4eb3788f5ee488a6a4c210cf9d0d912d6 /v4/api21/android | |
| parent | 75ad93503ad801e1cf76d69e448f955e3ce5c22b (diff) | |
| download | android_frameworks_support-e1eea177bd4993151679183e88171f1e50c33054.tar.gz android_frameworks_support-e1eea177bd4993151679183e88171f1e50c33054.tar.bz2 android_frameworks_support-e1eea177bd4993151679183e88171f1e50c33054.zip | |
Fixed bug preventing shared elements from transitioning.
The wrong collection was passed, never allowing shared elements
to be targeted.
Change-Id: If23fdcfc80a3c4a30dc4062a8c2ecc38bb43f5c3
Diffstat (limited to 'v4/api21/android')
| -rw-r--r-- | v4/api21/android/support/v4/app/FragmentTransitionCompat21.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/v4/api21/android/support/v4/app/FragmentTransitionCompat21.java b/v4/api21/android/support/v4/app/FragmentTransitionCompat21.java index 45f67a2518..ddcff2e3e3 100644 --- a/v4/api21/android/support/v4/app/FragmentTransitionCompat21.java +++ b/v4/api21/android/support/v4/app/FragmentTransitionCompat21.java @@ -107,8 +107,8 @@ class FragmentTransitionCompat21 { Object sharedElementTransitionObject, final View container, final ViewRetriever inFragment, final View nonExistentView, EpicenterView epicenterView, final Map<String, String> nameOverrides, - final ArrayList<View> enteringViews, final Map<String, View> renamedViews, - final ArrayList<View> sharedElementTargets) { + final ArrayList<View> enteringViews, final Map<String, View> namedViews, + final Map<String, View> renamedViews, final ArrayList<View> sharedElementTargets) { if (enterTransitionObject != null || sharedElementTransitionObject != null) { final Transition enterTransition = (Transition) enterTransitionObject; if (enterTransition != null) { @@ -116,7 +116,7 @@ class FragmentTransitionCompat21 { } if (sharedElementTransitionObject != null) { setSharedElementTargets(sharedElementTransitionObject, nonExistentView, - renamedViews, sharedElementTargets); + namedViews, sharedElementTargets); } if (inFragment != null) { |
