From 990205eada00ad3e575761d19607bb03e12f9aa3 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Tue, 24 Jun 2014 09:36:18 -0700
Subject: Don't use overlay to transition ImageViews.

Bug 15744992

MoveImage used an overlay to transition ImageViews. This
caused strange problems when ImageViews were contained in
other Views. The new ChangeImageTransform does a smooth
transition for changes in scale type and bounds.

Change-Id: Ia5021f4828f8f818a8699b3bdd38437aeba1cfc8
---
 core/java/android/widget/ImageView.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(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 5d578ca..e97177d 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -1117,6 +1117,20 @@ public class ImageView extends View {
         }
     }
 
+    /** @hide */
+    public void animateTransform(Matrix matrix) {
+        if (matrix == null) {
+            mDrawable.setBounds(0, 0, getWidth(), getHeight());
+        } else {
+            mDrawable.setBounds(0, 0, mDrawableWidth, mDrawableHeight);
+            if (mDrawMatrix == null) {
+                mDrawMatrix = new Matrix();
+            }
+            mDrawMatrix.set(matrix);
+        }
+        invalidate();
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-- 
cgit v1.1