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

Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev

Browse Source
This commit is contained in:
George Mount
2014-10-30 23:11:52 +00:00
committed by Android (Google) Code Review
parent 685a8770c0 ca5094a05c
commit 57928195a8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -638,6 +638,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
if (decorView != null) { if (decorView != null) {
decorView.getLocationOnScreen(decorLoc); decorView.getLocationOnScreen(decorLoc);
} }
Matrix tempMatrix = new Matrix();
for (String name: names) { for (String name: names) {
Bundle sharedElementBundle = state.getBundle(name); Bundle sharedElementBundle = state.getBundle(name);
if (sharedElementBundle != null) { if (sharedElementBundle != null) {
@@ -647,7 +648,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
snapshot = mListener.onCreateSnapshotView(context, parcelable); snapshot = mListener.onCreateSnapshotView(context, parcelable);
} }
if (snapshot != null) { if (snapshot != null) {
setSharedElementState(snapshot, name, state, null, null, decorLoc); setSharedElementState(snapshot, name, state, tempMatrix, null, decorLoc);
} }
snapshots.add(snapshot); snapshots.add(snapshot);
} }