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

am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev

Browse Source 
* commit '561261d4442fb78b314c00f6b836fe7b1c387977':
  Keep snapshot order matching the shared elements.
This commit is contained in:
George Mount
2014-12-03 02:17:58 +00:00
committed by Android Git Automerger
parent f17611a29e 561261d444
commit 24fac506f0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,17 +641,18 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
Matrix tempMatrix = new Matrix(); Matrix tempMatrix = new Matrix();
for (String name: names) { for (String name: names) {
Bundle sharedElementBundle = state.getBundle(name); Bundle sharedElementBundle = state.getBundle(name);
View snapshot = null;
if (sharedElementBundle != null) { if (sharedElementBundle != null) {
Parcelable parcelable = sharedElementBundle.getParcelable(KEY_SNAPSHOT); Parcelable parcelable = sharedElementBundle.getParcelable(KEY_SNAPSHOT);
View snapshot = null;
if (parcelable != null && mListener != null) { if (parcelable != null && mListener != null) {
snapshot = mListener.onCreateSnapshotView(context, parcelable); snapshot = mListener.onCreateSnapshotView(context, parcelable);
} }
if (snapshot != null) { if (snapshot != null) {
setSharedElementState(snapshot, name, state, tempMatrix, null, decorLoc); setSharedElementState(snapshot, name, state, tempMatrix, null, decorLoc);
} }
snapshots.add(snapshot);
} }
// Even null snapshots are added so they remain in the same order as shared elements.
snapshots.add(snapshot);
} }
return snapshots; return snapshots;
} }