commit 2ac85a6d3e1096b50f00f4236ae059bcdaecb761
author Adam Cohen <adamcohen@google.com> Mon Oct 14 22:43:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 14 22:43:03 2013 +0000
tree 75d57b62b1b6503fbbce7c0abea6015dceaaa42f
parent 9e91b7d5fccebc454424657e62497016ebdc7d1e
parent d4e53c882494f8cd7e4c0d44dbfc300d3610afcf

Merge "Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)" into jb-ub-now-indigo-rose

src/com/android/launcher3/FolderIcon.java

diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index 7e1e350..cd1ff2c 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -98,6 +98,7 @@
     private int mPreviewOffsetY;
     private float mMaxPerspectiveShift;
     boolean mAnimating = false;
+    private Rect mOldBounds = new Rect();
 
     private PreviewItemDrawingParams mParams = new PreviewItemDrawingParams(0, 0, 0, 0);
     private PreviewItemDrawingParams mAnimParams = new PreviewItemDrawingParams(0, 0, 0, 0);
@@ -534,6 +535,7 @@
         Drawable d = params.drawable;
 
         if (d != null) {
+            mOldBounds.set(d.getBounds());
             d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize);
             d.setFilterBitmap(true);
             d.setColorFilter(Color.argb(params.overlayAlpha, 255, 255, 255),
@@ -541,6 +543,7 @@
             d.draw(canvas);
             d.clearColorFilter();
             d.setFilterBitmap(false);
+            d.setBounds(mOldBounds);
         }
         canvas.restore();
     }