From 1ee60179bbc06823e1e0f6557ea6afdad0c3db4d Mon Sep 17 00:00:00 2001
From: Dake Gu <dake@google.com>
Date: Thu, 3 Jan 2013 15:11:43 -0800
Subject: fix ImageView.getImageMatrix()

getImageMatrix() does not return "mDrawMatrix",  instead it returns
mMatrix.  This is not reflecting the matrix used in drawing when
Bitmap is changed and mDrawMatrix is set to null while mMatrix still
holds old invalid data.

Change-Id: If24c3118068eca70cfe15786f9715d95c4499f3b
---
 core/java/android/widget/ImageView.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '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 @@ 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) {
-- 
cgit v1.1