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

2013-01-07 18:10:20 -08:00
parent 76c28e54b8 1ee60179bb
commit af6dd103bd
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) {