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

* commit 'af6dd103bd2bb0783b9364c703c2623260496d5c': fix ImageView.getImageMatrix()
2013-01-07 18:13:30 -08:00
parent aa516b10dd af6dd103bd
commit 05d485044b
1 changed files with 4 additions and 1 deletions
--- 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) {