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

* commit '05d485044bc4607759e2b4ca5188858bceb120f8': fix ImageView.getImageMatrix()
2013-01-09 11:53:36 -08:00
parent 8a9120f04e 05d485044b
commit 96c2a83cd7
1 changed files with 4 additions and 1 deletions
--- 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) {