summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/FolderIcon.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-14 15:40:53 -0700
committerWinson Chung <winsonc@google.com>2013-10-14 15:40:53 -0700
commitd4e53c882494f8cd7e4c0d44dbfc300d3610afcf (patch)
tree2ec7843a695c167ec6a55cebe4ece1ff19f1d345 /src/com/android/launcher3/FolderIcon.java
parent01c0214f727a25088ec4d62e64579155001cef9b (diff)
downloadandroid_packages_apps_Trebuchet-d4e53c882494f8cd7e4c0d44dbfc300d3610afcf.tar.gz
android_packages_apps_Trebuchet-d4e53c882494f8cd7e4c0d44dbfc300d3610afcf.tar.bz2
android_packages_apps_Trebuchet-d4e53c882494f8cd7e4c0d44dbfc300d3610afcf.zip
Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)
Change-Id: I0cef3916217bd3808363cafcfb25c2cd140f35fc
Diffstat (limited to 'src/com/android/launcher3/FolderIcon.java')
-rw-r--r--src/com/android/launcher3/FolderIcon.java3
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();
}