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

Merge "Check for null Drawable in MoveImage"

Browse Source
This commit is contained in:
George Mount
2014-05-13 23:31:09 +00:00
committed by Android (Google) Code Review
parent 597f1b8481 d8cdb8cc2c
commit 11d0415481
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/transition/MoveImage.java
View File

@@ -64,7 +64,13 @@ public class MoveImage extends Transition {
if (!(view instanceof ImageView) || view.getVisibility() != View.VISIBLE) {
return;
}
ImageView imageView = (ImageView) view;
Drawable drawable = imageView.getDrawable();
if (drawable == null) {
return;
}
Map<String, Object> values = transitionValues.values;
values.put(PROPNAME_DRAWABLE, drawable);
ViewGroup parent = (ViewGroup) view.getParent();
parent.getLocationInWindow(mTempLoc);
@@ -79,11 +85,9 @@ public class MoveImage extends Transition {
Rect bounds = new Rect(left, top, right, bottom);
values.put(PROPNAME_BOUNDS, bounds);
ImageView imageView = (ImageView) view;
Matrix matrix = getMatrix(imageView);
values.put(PROPNAME_MATRIX, matrix);
values.put(PROPNAME_CLIP, findClip(imageView));
values.put(PROPNAME_DRAWABLE, imageView.getDrawable());
}
@Override