diff options
| author | Dake Gu <dake@google.com> | 2013-01-09 11:53:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-09 11:53:36 -0800 |
| commit | 96c2a83cd7bcb2d01338fa29849d5ac42d0cd088 (patch) | |
| tree | ab229cfc9c697ceaf7ef04f936436674bad25990 /core/java/android/widget/ImageView.java | |
| parent | 8a9120f04ec0ef403e60e6225badab7a69bccf59 (diff) | |
| parent | 05d485044bc4607759e2b4ca5188858bceb120f8 (diff) | |
| download | frameworks_base-96c2a83cd7bcb2d01338fa29849d5ac42d0cd088.zip frameworks_base-96c2a83cd7bcb2d01338fa29849d5ac42d0cd088.tar.gz frameworks_base-96c2a83cd7bcb2d01338fa29849d5ac42d0cd088.tar.bz2 | |
am 05d48504: am af6dd103: Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev
* commit '05d485044bc4607759e2b4ca5188858bceb120f8':
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 b40260c..8c710ce 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -567,7 +567,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) { |