commit af6dd103bd2bb0783b9364c703c2623260496d5c
author Dake Gu <dake@google.com> Mon Jan 07 18:10:20 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 07 18:10:21 2013 -0800
tree 45c044b62c31e1b53cc630389c8cee477675d855
parent 76c28e54b876207d468309aecb2ff2f4708a6ca4
parent 1ee60179bbc06823e1e0f6557ea6afdad0c3db4d

Merge "fix ImageView.getImageMatrix()" into jb-mr1-aah-dev

core/java/android/widget/ImageView.java

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 @@
         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) {