diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-14 22:43:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 22:43:03 +0000 |
commit | 2ac85a6d3e1096b50f00f4236ae059bcdaecb761 (patch) | |
tree | 75d57b62b1b6503fbbce7c0abea6015dceaaa42f | |
parent | 9e91b7d5fccebc454424657e62497016ebdc7d1e (diff) | |
parent | d4e53c882494f8cd7e4c0d44dbfc300d3610afcf (diff) | |
download | android_packages_apps_Trebuchet-2ac85a6d3e1096b50f00f4236ae059bcdaecb761.tar.gz android_packages_apps_Trebuchet-2ac85a6d3e1096b50f00f4236ae059bcdaecb761.tar.bz2 android_packages_apps_Trebuchet-2ac85a6d3e1096b50f00f4236ae059bcdaecb761.zip |
Merge "Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)" into jb-ub-now-indigo-rose
-rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 7e1e350a4..cd1ff2c37 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -98,6 +98,7 @@ public class FolderIcon extends LinearLayout implements FolderListener { 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 @@ public class FolderIcon extends LinearLayout implements FolderListener { 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 @@ public class FolderIcon extends LinearLayout implements FolderListener { d.draw(canvas); d.clearColorFilter(); d.setFilterBitmap(false); + d.setBounds(mOldBounds); } canvas.restore(); } |