PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2ac85a6d3e1096b50f00f4236ae059bcdaecb761':
  Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)
This commit is contained in:
Adam Cohen
2013-10-14 15:45:44 -07:00
committed by Android Git Automerger
parent 8e93c09ccd 2ac85a6d3e
commit 2cc2e4ab30
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/FolderIcon.java
+3
View File
@@ -98,6 +98,7 @@ public class FolderIcon extends LinearLayout implements FolderListener {
private int mPreviewOffsetY; private int mPreviewOffsetY;
private float mMaxPerspectiveShift; private float mMaxPerspectiveShift;
boolean mAnimating = false; boolean mAnimating = false;
private Rect mOldBounds = new Rect();
private PreviewItemDrawingParams mParams = new PreviewItemDrawingParams(0, 0, 0, 0); private PreviewItemDrawingParams mParams = new PreviewItemDrawingParams(0, 0, 0, 0);
private PreviewItemDrawingParams mAnimParams = 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; Drawable d = params.drawable;
if (d != null) { if (d != null) {
mOldBounds.set(d.getBounds());
d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize); d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize);
d.setFilterBitmap(true); d.setFilterBitmap(true);
d.setColorFilter(Color.argb(params.overlayAlpha, 255, 255, 255), d.setColorFilter(Color.argb(params.overlayAlpha, 255, 255, 255),
@@ -541,6 +543,7 @@ public class FolderIcon extends LinearLayout implements FolderListener {
d.draw(canvas); d.draw(canvas);
d.clearColorFilter(); d.clearColorFilter();
d.setFilterBitmap(false); d.setFilterBitmap(false);
d.setBounds(mOldBounds);
} }
canvas.restore(); canvas.restore();
} }