commit b690999cf024500b904754f8b3549a1d65ecfc57
author Adam Powell <adamp@google.com> Tue Aug 02 18:45:01 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 18:45:01 2011 -0700
tree c50259254b7de9df33fdbf39078c724659279dac
parent 2d530bff7a0965a73791b29a3f6b3c0e1383e6cf
parent 84080602f15a6f0f7c95cdb6deb00091af4d31c2

Merge "Follow framework API changes"

src/com/android/contacts/list/ShortcutIntentBuilder.java

diff --git a/src/com/android/contacts/list/ShortcutIntentBuilder.java b/src/com/android/contacts/list/ShortcutIntentBuilder.java
index 43a6c1e..3aa0b55 100644
--- a/src/com/android/contacts/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -297,6 +297,7 @@
 
         overlay.setBounds(dst);
         overlay.draw(canvas);
+        canvas.setBitmap(null);
 
         return icon;
     }
@@ -373,6 +374,8 @@
             canvas.drawBitmap(phoneIcon, src, dst, photoPaint);
         }
 
+        canvas.setBitmap(null);
+
         return icon;
     }
 }

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 a58a6c9..e2f8a87 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -179,6 +179,7 @@
                     paint);
             canvas.clipRect(mClipRect);
             view.draw(canvas);
+            canvas.setBitmap(null);
             mPreviousStateView.setVisibility(View.VISIBLE);
 
             mEnterAnimation.setTarget(view);