diff options
| author | Dake Gu <dake@google.com> | 2013-01-07 18:13:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-07 18:13:30 -0800 |
| commit | 05d485044bc4607759e2b4ca5188858bceb120f8 (patch) | |
| tree | 22987ff7e8e01a71135dcadeee56b73fa523c419 /core/java/android/widget/ImageView.java | |
| parent | aa516b10ddbca4097102a068206df17bcfb7f322 (diff) | |
| parent | af6dd103bd2bb0783b9364c703c2623260496d5c (diff) | |
| download | frameworks_base-05d485044bc4607759e2b4ca5188858bceb120f8.zip frameworks_base-05d485044bc4607759e2b4ca5188858bceb120f8.tar.gz frameworks_base-05d485044bc4607759e2b4ca5188858bceb120f8.tar.bz2 | |
am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev
* commit 'af6dd103bd2bb0783b9364c703c2623260496d5c':
fix ImageView.getImageMatrix()
Diffstat (limited to 'core/java/android/widget/ImageView.java')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 87396fb..26c801f 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -551,7 +551,10 @@ public class ImageView extends View { applied to the drawable, be sure to call setImageMatrix(). */ public Matrix getImageMatrix() { - return mMatrix; + if (mDrawMatrix == null) { + return Matrix.IDENTITY_MATRIX; + } + return mDrawMatrix; } public void setImageMatrix(Matrix matrix) { |