commit afec61f0875b36313b0c78a2d89a9d04ceb3e36a
author Dmitri Plotnikov <dplotnikov@google.com> Wed Nov 17 12:25:40 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 17 12:25:40 2010 -0800
tree cf11ede39ad581b8f924bc60dc66a334541f9521
parent 247b29f31859c6054247824edbc152eafe4ef92a
parent 11a2cb156aedd48424651508689e56374fb10a25

Merge "Disabling transition animation when view has size=0"

src/com/android/contacts/widget/TransitionAnimationView.java

diff --git a/src/com/android/contacts/widget/TransitionAnimationView.java b/src/com/android/contacts/widget/TransitionAnimationView.java
index 114e97d..d0e81fe 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -106,12 +106,19 @@
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         if (changed) {
-            mPreviousStateBitmap = Bitmap.createBitmap(
-                    right - left, bottom - top, Bitmap.Config.ARGB_8888);
-            mPreviousStateView.setBackgroundDrawable(
-                    new BitmapDrawable(getContext().getResources(), mPreviousStateBitmap));
-            mClipRect.set(mClipMargins.left, mClipMargins.top,
-                    right - left - mClipMargins.right, bottom - top - mClipMargins.bottom);
+            int width = right - left;
+            int height = bottom - top;
+            if (width > 0 && height > 0) {
+                mPreviousStateBitmap = Bitmap.createBitmap(
+                        width, height, Bitmap.Config.ARGB_8888);
+                mPreviousStateView.setBackgroundDrawable(
+                        new BitmapDrawable(getContext().getResources(), mPreviousStateBitmap));
+                mClipRect.set(mClipMargins.left, mClipMargins.top,
+                        width - mClipMargins.right, height - mClipMargins.bottom);
+            } else {
+                mPreviousStateBitmap = null;
+                mPreviousStateView = null;
+            }
         }
     }
 
@@ -147,6 +154,10 @@
             mExitAnimation.setTarget(view);
             mExitAnimation.start();
         } else {
+            if (mPreviousStateBitmap == null) {
+                return;
+            }
+
             Canvas canvas = new Canvas(mPreviousStateBitmap);
             Paint paint = new Paint();
             paint.setColor(Color.TRANSPARENT);